b2894lxlx/tms-erp-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/20261103-bfi-warehouse-material' into feature/20261103-bfi-warehouse-material

Browse Source
This commit is contained in:
刘泉佳
2026-11-04 19:27:18 +08:00
parent 497e7d7bf0 c47931bb24
commit edfb3be223
214 changed files with 10110 additions and 1362 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/sql/transport/blade_base_menu_view_permission_patch_20261104.sql
+44
View File
@@ -0,0 +1,44 @@
-- ----------------------------
-- 补齐基础/系统业务模块「查看」按钮权限（角色授权用）
-- 执行前请确认目标库尚未存在同 code 菜单
-- ----------------------------
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`)
SELECT 2075429330000000001, 2075421555200860162, 'port_terminal_view', '查看', 'port_terminal_view', '', '', 1, 2, 0, 1, NULL, '', 0
FROM DUAL
WHERE NOT EXISTS (SELECT 1 FROM `blade_menu` WHERE `code` = 'port_terminal_view' AND `is_deleted` = 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`)
SELECT 2075429280000000001, 2075427962415456258, 'railway_station_view', '查看', 'railway_station_view', '', '', 1, 2, 0, 1, NULL, '', 0
FROM DUAL
WHERE NOT EXISTS (SELECT 1 FROM `blade_menu` WHERE `code` = 'railway_station_view' AND `is_deleted` = 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`)
SELECT 2075431850000000001, 2075431169720033282, 'airport_master_view', '查看', 'airport_master_view', '', '', 1, 2, 0, 1, NULL, '', 0
FROM DUAL
WHERE NOT EXISTS (SELECT 1 FROM `blade_menu` WHERE `code` = 'airport_master_view' AND `is_deleted` = 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`)
SELECT 2075449000000000009, 2075449000000000001, 'currency_view', '查看', 'currency_view', '', '', 1, 2, 0, 1, NULL, '', 0
FROM DUAL
WHERE NOT EXISTS (SELECT 1 FROM `blade_menu` WHERE `code` = 'currency_view' AND `is_deleted` = 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`)
SELECT 2075449100000000006, 2075449100000000001, 'customer_type_view', '查看', 'customer_type_view', '', '', 1, 2, 0, 1, NULL, '', 0
FROM DUAL
WHERE NOT EXISTS (SELECT 1 FROM `blade_menu` WHERE `code` = 'customer_type_view' AND `is_deleted` = 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`)
SELECT 2075449200000000009, 2075449200000000001, 'fee_item_view', '查看', 'fee_item_view', '', '', 1, 2, 0, 1, NULL, '', 0
FROM DUAL
WHERE NOT EXISTS (SELECT 1 FROM `blade_menu` WHERE `code` = 'fee_item_view' AND `is_deleted` = 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`)
SELECT 2075449300000000006, 2075449300000000001, 'measurement_unit_view', '查看', 'measurement_unit_view', '', '', 1, 2, 0, 1, NULL, '', 0
FROM DUAL
WHERE NOT EXISTS (SELECT 1 FROM `blade_menu` WHERE `code` = 'measurement_unit_view' AND `is_deleted` = 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`)
SELECT 2080110200000000105, 2080110200000000101, 'business_dept_config_view', '查看', 'business_dept_config_view', '', '', 4, 2, 0, 1, NULL, '', 0
FROM DUAL
WHERE NOT EXISTS (SELECT 1 FROM `blade_menu` WHERE `code` = 'business_dept_config_view' AND `is_deleted` = 0);
doc/sql/transport/blade_biz_dept_backfill_by_creator_20261104.sql
+511
View File
@@ -0,0 +1,511 @@
-- ----------------------------
-- 业务数据「所属组织」旧残留批量订正
-- 口径：按创建人当前所属组织（blade_user.dept_id 首个）回填 dept_id / dept_name（或 organization_name）
-- 适用：各环境 OA/组织同步后，业务表仍挂着已删/不存在/空组织的存量数据
-- 可重复执行；update_time 不改，保留原值
-- ----------------------------
--
-- 订正范围（仅处理残留）：
-- 1) dept_id 为空或 <=0
-- 2) dept_id 在 blade_dept 中不存在或已逻辑删除
-- 仅名称字段的表：organization_name / dept_name 为空，或名称在当前未删除组织中找不到
--
-- 取值规则：
-- create_user → blade_user.dept_id（多组织取逗号分隔第一个，与登录态 AuthUtil.firstLong 一致）
-- → blade_dept.dept_name
-- 创建人无组织、或组织已失效：跳过该行
--
-- 特殊：
-- blade_customer_archive 客商所属组织业务上固定为「广西现代物流集团有限公司」，
-- 不按创建人组织回填，残留时改挂该顶级组织。
-- 合同负责部门（organization_id）/ 票据使用部门（blade_bill_payment.dept_id）不在本脚本范围。
--
-- 执行顺序：
-- 0 预览 → 1 备份 → 2 订正 → 3 校验；出问题用 4 回退
-- ----------------------------
SET NAMES utf8mb4;
-- ----------------------------
-- 0. 预览：各表待订正条数（执行订正前先看）
-- ----------------------------
-- DROP TEMPORARY TABLE IF EXISTS tmp_user_current_dept;
-- CREATE TEMPORARY TABLE tmp_user_current_dept AS
-- SELECT
-- u.id AS user_id,
-- CAST(SUBSTRING_INDEX(TRIM(u.dept_id), ',', 1) AS UNSIGNED) AS dept_id,
-- d.dept_name AS dept_name
-- FROM blade_user u
-- INNER JOIN blade_dept d
-- ON d.id = CAST(SUBSTRING_INDEX(TRIM(IFNULL(u.dept_id, '')), ',', 1) AS UNSIGNED)
-- AND IFNULL(d.is_deleted, 0) = 0
-- WHERE IFNULL(u.is_deleted, 0) = 0
-- AND IFNULL(TRIM(u.dept_id), '') <> ''
-- AND CAST(SUBSTRING_INDEX(TRIM(u.dept_id), ',', 1) AS UNSIGNED) > 0;
-- ALTER TABLE tmp_user_current_dept ADD PRIMARY KEY (user_id);
--
-- SELECT 'blade_common_route' AS table_name, COUNT(*) AS pending_cnt
-- FROM blade_common_route t
-- INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
-- WHERE IFNULL(t.is_deleted, 0) = 0
-- AND (t.dept_id IS NULL OR t.dept_id <= 0
-- OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
-- -- 其余表同理，可按第 2 节表清单自行复制预览
-- ----------------------------
-- 1. 备份表（不存在则创建；可重复执行）
-- ----------------------------
CREATE TABLE IF NOT EXISTS blade_biz_dept_backfill_bak_20261104 (
bak_id BIGINT NOT NULL AUTO_INCREMENT,
table_name VARCHAR(64) NOT NULL,
biz_id BIGINT NOT NULL,
old_dept_id BIGINT DEFAULT NULL,
old_dept_name VARCHAR(255) DEFAULT NULL,
new_dept_id BIGINT DEFAULT NULL,
new_dept_name VARCHAR(255) DEFAULT NULL,
create_user BIGINT DEFAULT NULL,
bak_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (bak_id),
KEY idx_biz_dept_bak_table_biz (table_name, biz_id)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='所属组织订正备份20261104';
START TRANSACTION;
-- 创建人 → 当前所属组织（多组织取第一个）
DROP TEMPORARY TABLE IF EXISTS tmp_user_current_dept;
CREATE TEMPORARY TABLE tmp_user_current_dept AS
SELECT
u.id AS user_id,
CAST(SUBSTRING_INDEX(TRIM(u.dept_id), ',', 1) AS UNSIGNED) AS dept_id,
d.dept_name AS dept_name
FROM blade_user u
INNER JOIN blade_dept d
ON d.id = CAST(SUBSTRING_INDEX(TRIM(IFNULL(u.dept_id, '')), ',', 1) AS UNSIGNED)
AND IFNULL(d.is_deleted, 0) = 0
WHERE IFNULL(u.is_deleted, 0) = 0
AND IFNULL(TRIM(u.dept_id), '') <> ''
AND CAST(SUBSTRING_INDEX(TRIM(u.dept_id), ',', 1) AS UNSIGNED) > 0;
ALTER TABLE tmp_user_current_dept ADD PRIMARY KEY (user_id);
-- 客商固定顶级组织
DROP TEMPORARY TABLE IF EXISTS tmp_fixed_owner_dept;
CREATE TEMPORARY TABLE tmp_fixed_owner_dept AS
SELECT d.id AS dept_id, d.dept_name
FROM blade_dept d
WHERE IFNULL(d.is_deleted, 0) = 0
AND d.dept_name = '广西现代物流集团有限公司'
ORDER BY d.id
LIMIT 1;
ALTER TABLE tmp_fixed_owner_dept ADD PRIMARY KEY (dept_id);
-- ----------------------------
-- 2. 订正：dept_id + dept_name 类表
-- ----------------------------
-- 2.1 常用线路
INSERT INTO blade_biz_dept_backfill_bak_20261104 (table_name, biz_id, old_dept_id, old_dept_name, new_dept_id, new_dept_name, create_user)
SELECT 'blade_common_route', t.id, t.dept_id, t.dept_name, c.dept_id, c.dept_name, t.create_user
FROM blade_common_route t
INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
WHERE IFNULL(t.is_deleted, 0) = 0
AND (t.dept_id IS NULL OR t.dept_id <= 0
OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
UPDATE blade_common_route t
INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
SET t.dept_id = c.dept_id, t.dept_name = c.dept_name
WHERE IFNULL(t.is_deleted, 0) = 0
AND (t.dept_id IS NULL OR t.dept_id <= 0
OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
-- 2.2 常用货物
INSERT INTO blade_biz_dept_backfill_bak_20261104 (table_name, biz_id, old_dept_id, old_dept_name, new_dept_id, new_dept_name, create_user)
SELECT 'blade_common_cargo', t.id, t.dept_id, t.dept_name, c.dept_id, c.dept_name, t.create_user
FROM blade_common_cargo t
INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
WHERE IFNULL(t.is_deleted, 0) = 0
AND (t.dept_id IS NULL OR t.dept_id <= 0
OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
UPDATE blade_common_cargo t
INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
SET t.dept_id = c.dept_id, t.dept_name = c.dept_name
WHERE IFNULL(t.is_deleted, 0) = 0
AND (t.dept_id IS NULL OR t.dept_id <= 0
OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
-- 2.3 过程配置
INSERT INTO blade_biz_dept_backfill_bak_20261104 (table_name, biz_id, old_dept_id, old_dept_name, new_dept_id, new_dept_name, create_user)
SELECT 'blade_process_config', t.id, t.dept_id, t.dept_name, c.dept_id, c.dept_name, t.create_user
FROM blade_process_config t
INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
WHERE IFNULL(t.is_deleted, 0) = 0
AND (t.dept_id IS NULL OR t.dept_id <= 0
OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
UPDATE blade_process_config t
INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
SET t.dept_id = c.dept_id, t.dept_name = c.dept_name
WHERE IFNULL(t.is_deleted, 0) = 0
AND (t.dept_id IS NULL OR t.dept_id <= 0
OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
-- 2.4 发货模板
INSERT INTO blade_biz_dept_backfill_bak_20261104 (table_name, biz_id, old_dept_id, old_dept_name, new_dept_id, new_dept_name, create_user)
SELECT 'blade_shipping_template', t.id, t.dept_id, t.dept_name, c.dept_id, c.dept_name, t.create_user
FROM blade_shipping_template t
INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
WHERE IFNULL(t.is_deleted, 0) = 0
AND (t.dept_id IS NULL OR t.dept_id <= 0
OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
UPDATE blade_shipping_template t
INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
SET t.dept_id = c.dept_id, t.dept_name = c.dept_name
WHERE IFNULL(t.is_deleted, 0) = 0
AND (t.dept_id IS NULL OR t.dept_id <= 0
OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
-- 2.5 运输计划
INSERT INTO blade_biz_dept_backfill_bak_20261104 (table_name, biz_id, old_dept_id, old_dept_name, new_dept_id, new_dept_name, create_user)
SELECT 'blade_transport_plan', t.id, t.dept_id, t.dept_name, c.dept_id, c.dept_name, t.create_user
FROM blade_transport_plan t
INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
WHERE IFNULL(t.is_deleted, 0) = 0
AND (t.dept_id IS NULL OR t.dept_id <= 0
OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
UPDATE blade_transport_plan t
INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
SET t.dept_id = c.dept_id, t.dept_name = c.dept_name
WHERE IFNULL(t.is_deleted, 0) = 0
AND (t.dept_id IS NULL OR t.dept_id <= 0
OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
-- 2.6 运单
INSERT INTO blade_biz_dept_backfill_bak_20261104 (table_name, biz_id, old_dept_id, old_dept_name, new_dept_id, new_dept_name, create_user)
SELECT 'blade_waybill', t.id, t.dept_id, t.dept_name, c.dept_id, c.dept_name, t.create_user
FROM blade_waybill t
INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
WHERE IFNULL(t.is_deleted, 0) = 0
AND (t.dept_id IS NULL OR t.dept_id <= 0
OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
UPDATE blade_waybill t
INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
SET t.dept_id = c.dept_id, t.dept_name = c.dept_name
WHERE IFNULL(t.is_deleted, 0) = 0
AND (t.dept_id IS NULL OR t.dept_id <= 0
OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
-- 2.7 配载
INSERT INTO blade_biz_dept_backfill_bak_20261104 (table_name, biz_id, old_dept_id, old_dept_name, new_dept_id, new_dept_name, create_user)
SELECT 'blade_loading_manage', t.id, t.dept_id, t.dept_name, c.dept_id, c.dept_name, t.create_user
FROM blade_loading_manage t
INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
WHERE IFNULL(t.is_deleted, 0) = 0
AND (t.dept_id IS NULL OR t.dept_id <= 0
OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
UPDATE blade_loading_manage t
INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
SET t.dept_id = c.dept_id, t.dept_name = c.dept_name
WHERE IFNULL(t.is_deleted, 0) = 0
AND (t.dept_id IS NULL OR t.dept_id <= 0
OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
-- 2.8 常用地址
INSERT INTO blade_biz_dept_backfill_bak_20261104 (table_name, biz_id, old_dept_id, old_dept_name, new_dept_id, new_dept_name, create_user)
SELECT 'blade_common_address', t.id, t.dept_id, t.dept_name, c.dept_id, c.dept_name, t.create_user
FROM blade_common_address t
INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
WHERE IFNULL(t.is_deleted, 0) = 0
AND (t.dept_id IS NULL OR t.dept_id <= 0
OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
UPDATE blade_common_address t
INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
SET t.dept_id = c.dept_id, t.dept_name = c.dept_name
WHERE IFNULL(t.is_deleted, 0) = 0
AND (t.dept_id IS NULL OR t.dept_id <= 0
OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
-- 2.9 预结算
INSERT INTO blade_biz_dept_backfill_bak_20261104 (table_name, biz_id, old_dept_id, old_dept_name, new_dept_id, new_dept_name, create_user)
SELECT 'blade_pre_settlement', t.id, t.dept_id, t.dept_name, c.dept_id, c.dept_name, t.create_user
FROM blade_pre_settlement t
INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
WHERE IFNULL(t.is_deleted, 0) = 0
AND (t.dept_id IS NULL OR t.dept_id <= 0
OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
UPDATE blade_pre_settlement t
INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
SET t.dept_id = c.dept_id, t.dept_name = c.dept_name
WHERE IFNULL(t.is_deleted, 0) = 0
AND (t.dept_id IS NULL OR t.dept_id <= 0
OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
-- 2.10 正式结算
INSERT INTO blade_biz_dept_backfill_bak_20261104 (table_name, biz_id, old_dept_id, old_dept_name, new_dept_id, new_dept_name, create_user)
SELECT 'blade_formal_settlement', t.id, t.dept_id, t.dept_name, c.dept_id, c.dept_name, t.create_user
FROM blade_formal_settlement t
INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
WHERE IFNULL(t.is_deleted, 0) = 0
AND (t.dept_id IS NULL OR t.dept_id <= 0
OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
UPDATE blade_formal_settlement t
INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
SET t.dept_id = c.dept_id, t.dept_name = c.dept_name
WHERE IFNULL(t.is_deleted, 0) = 0
AND (t.dept_id IS NULL OR t.dept_id <= 0
OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
-- 2.11 应收应付明细
INSERT INTO blade_biz_dept_backfill_bak_20261104 (table_name, biz_id, old_dept_id, old_dept_name, new_dept_id, new_dept_name, create_user)
SELECT 'blade_receivable_payable_detail', t.id, t.dept_id, t.dept_name, c.dept_id, c.dept_name, t.create_user
FROM blade_receivable_payable_detail t
INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
WHERE IFNULL(t.is_deleted, 0) = 0
AND (t.dept_id IS NULL OR t.dept_id <= 0
OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
UPDATE blade_receivable_payable_detail t
INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
SET t.dept_id = c.dept_id, t.dept_name = c.dept_name
WHERE IFNULL(t.is_deleted, 0) = 0
AND (t.dept_id IS NULL OR t.dept_id <= 0
OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
-- 2.12 异常处置
INSERT INTO blade_biz_dept_backfill_bak_20261104 (table_name, biz_id, old_dept_id, old_dept_name, new_dept_id, new_dept_name, create_user)
SELECT 'blade_exception_disposal', t.id, t.dept_id, t.dept_name, c.dept_id, c.dept_name, t.create_user
FROM blade_exception_disposal t
INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
WHERE IFNULL(t.is_deleted, 0) = 0
AND (t.dept_id IS NULL OR t.dept_id <= 0
OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
UPDATE blade_exception_disposal t
INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
SET t.dept_id = c.dept_id, t.dept_name = c.dept_name
WHERE IFNULL(t.is_deleted, 0) = 0
AND (t.dept_id IS NULL OR t.dept_id <= 0
OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
-- 2.13 风险处置
INSERT INTO blade_biz_dept_backfill_bak_20261104 (table_name, biz_id, old_dept_id, old_dept_name, new_dept_id, new_dept_name, create_user)
SELECT 'blade_risk_disposal', t.id, t.dept_id, t.dept_name, c.dept_id, c.dept_name, t.create_user
FROM blade_risk_disposal t
INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
WHERE IFNULL(t.is_deleted, 0) = 0
AND (t.dept_id IS NULL OR t.dept_id <= 0
OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
UPDATE blade_risk_disposal t
INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
SET t.dept_id = c.dept_id, t.dept_name = c.dept_name
WHERE IFNULL(t.is_deleted, 0) = 0
AND (t.dept_id IS NULL OR t.dept_id <= 0
OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
-- 2.14 开票申请
INSERT INTO blade_biz_dept_backfill_bak_20261104 (table_name, biz_id, old_dept_id, old_dept_name, new_dept_id, new_dept_name, create_user)
SELECT 'blade_invoice_application', t.id, t.dept_id, t.dept_name, c.dept_id, c.dept_name, t.create_user
FROM blade_invoice_application t
INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
WHERE IFNULL(t.is_deleted, 0) = 0
AND (t.dept_id IS NULL OR t.dept_id <= 0
OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
UPDATE blade_invoice_application t
INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
SET t.dept_id = c.dept_id, t.dept_name = c.dept_name
WHERE IFNULL(t.is_deleted, 0) = 0
AND (t.dept_id IS NULL OR t.dept_id <= 0
OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
-- 2.15 收票登记
INSERT INTO blade_biz_dept_backfill_bak_20261104 (table_name, biz_id, old_dept_id, old_dept_name, new_dept_id, new_dept_name, create_user)
SELECT 'blade_invoice_receipt', t.id, t.dept_id, t.dept_name, c.dept_id, c.dept_name, t.create_user
FROM blade_invoice_receipt t
INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
WHERE IFNULL(t.is_deleted, 0) = 0
AND (t.dept_id IS NULL OR t.dept_id <= 0
OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
UPDATE blade_invoice_receipt t
INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
SET t.dept_id = c.dept_id, t.dept_name = c.dept_name
WHERE IFNULL(t.is_deleted, 0) = 0
AND (t.dept_id IS NULL OR t.dept_id <= 0
OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
-- 2.16 付款申请
INSERT INTO blade_biz_dept_backfill_bak_20261104 (table_name, biz_id, old_dept_id, old_dept_name, new_dept_id, new_dept_name, create_user)
SELECT 'blade_payment_application', t.id, t.dept_id, t.dept_name, c.dept_id, c.dept_name, t.create_user
FROM blade_payment_application t
INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
WHERE IFNULL(t.is_deleted, 0) = 0
AND (t.dept_id IS NULL OR t.dept_id <= 0
OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
UPDATE blade_payment_application t
INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
SET t.dept_id = c.dept_id, t.dept_name = c.dept_name
WHERE IFNULL(t.is_deleted, 0) = 0
AND (t.dept_id IS NULL OR t.dept_id <= 0
OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
-- 2.17 运输对账
INSERT INTO blade_biz_dept_backfill_bak_20261104 (table_name, biz_id, old_dept_id, old_dept_name, new_dept_id, new_dept_name, create_user)
SELECT 'blade_transport_reconciliation', t.id, t.dept_id, t.dept_name, c.dept_id, c.dept_name, t.create_user
FROM blade_transport_reconciliation t
INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
WHERE IFNULL(t.is_deleted, 0) = 0
AND (t.dept_id IS NULL OR t.dept_id <= 0
OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
UPDATE blade_transport_reconciliation t
INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
SET t.dept_id = c.dept_id, t.dept_name = c.dept_name
WHERE IFNULL(t.is_deleted, 0) = 0
AND (t.dept_id IS NULL OR t.dept_id <= 0
OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
-- 2.18 客商档案：固定挂顶级「广西现代物流集团有限公司」
INSERT INTO blade_biz_dept_backfill_bak_20261104 (table_name, biz_id, old_dept_id, old_dept_name, new_dept_id, new_dept_name, create_user)
SELECT 'blade_customer_archive', t.id, t.dept_id, t.dept_name, f.dept_id, f.dept_name, t.create_user
FROM blade_customer_archive t
CROSS JOIN tmp_fixed_owner_dept f
WHERE IFNULL(t.is_deleted, 0) = 0
AND (t.dept_id IS NULL OR t.dept_id <= 0
OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0)
OR IFNULL(t.dept_id, 0) <> f.dept_id);
UPDATE blade_customer_archive t
CROSS JOIN tmp_fixed_owner_dept f
SET t.dept_id = f.dept_id,
t.dept_ids = CAST(f.dept_id AS CHAR),
t.dept_name = f.dept_name
WHERE IFNULL(t.is_deleted, 0) = 0
AND (t.dept_id IS NULL OR t.dept_id <= 0
OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0)
OR IFNULL(t.dept_id, 0) <> f.dept_id);
-- ----------------------------
-- 2.19 仅名称字段：司机 / 车辆 / 船舶 / 派车
-- ----------------------------
INSERT INTO blade_biz_dept_backfill_bak_20261104 (table_name, biz_id, old_dept_id, old_dept_name, new_dept_id, new_dept_name, create_user)
SELECT 'blade_transport_driver', t.id, NULL, t.organization_name, c.dept_id, c.dept_name, t.create_user
FROM blade_transport_driver t
INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
WHERE IFNULL(t.is_deleted, 0) = 0
AND (t.organization_name IS NULL OR TRIM(t.organization_name) = ''
OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE IFNULL(d.is_deleted, 0) = 0 AND d.dept_name = t.organization_name));
UPDATE blade_transport_driver t
INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
SET t.organization_name = c.dept_name
WHERE IFNULL(t.is_deleted, 0) = 0
AND (t.organization_name IS NULL OR TRIM(t.organization_name) = ''
OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE IFNULL(d.is_deleted, 0) = 0 AND d.dept_name = t.organization_name));
INSERT INTO blade_biz_dept_backfill_bak_20261104 (table_name, biz_id, old_dept_id, old_dept_name, new_dept_id, new_dept_name, create_user)
SELECT 'blade_transport_vehicle', t.id, NULL, t.organization_name, c.dept_id, c.dept_name, t.create_user
FROM blade_transport_vehicle t
INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
WHERE IFNULL(t.is_deleted, 0) = 0
AND (t.organization_name IS NULL OR TRIM(t.organization_name) = ''
OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE IFNULL(d.is_deleted, 0) = 0 AND d.dept_name = t.organization_name));
UPDATE blade_transport_vehicle t
INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
SET t.organization_name = c.dept_name
WHERE IFNULL(t.is_deleted, 0) = 0
AND (t.organization_name IS NULL OR TRIM(t.organization_name) = ''
OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE IFNULL(d.is_deleted, 0) = 0 AND d.dept_name = t.organization_name));
INSERT INTO blade_biz_dept_backfill_bak_20261104 (table_name, biz_id, old_dept_id, old_dept_name, new_dept_id, new_dept_name, create_user)
SELECT 'blade_transport_ship', t.id, NULL, t.organization_name, c.dept_id, c.dept_name, t.create_user
FROM blade_transport_ship t
INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
WHERE IFNULL(t.is_deleted, 0) = 0
AND (t.organization_name IS NULL OR TRIM(t.organization_name) = ''
OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE IFNULL(d.is_deleted, 0) = 0 AND d.dept_name = t.organization_name));
UPDATE blade_transport_ship t
INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
SET t.organization_name = c.dept_name
WHERE IFNULL(t.is_deleted, 0) = 0
AND (t.organization_name IS NULL OR TRIM(t.organization_name) = ''
OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE IFNULL(d.is_deleted, 0) = 0 AND d.dept_name = t.organization_name));
INSERT INTO blade_biz_dept_backfill_bak_20261104 (table_name, biz_id, old_dept_id, old_dept_name, new_dept_id, new_dept_name, create_user)
SELECT 'blade_vehicle_dispatch', t.id, NULL, t.organization_name, c.dept_id, c.dept_name, t.create_user
FROM blade_vehicle_dispatch t
INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
WHERE IFNULL(t.is_deleted, 0) = 0
AND (t.organization_name IS NULL OR TRIM(t.organization_name) = ''
OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE IFNULL(d.is_deleted, 0) = 0 AND d.dept_name = t.organization_name));
UPDATE blade_vehicle_dispatch t
INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
SET t.organization_name = c.dept_name
WHERE IFNULL(t.is_deleted, 0) = 0
AND (t.organization_name IS NULL OR TRIM(t.organization_name) = ''
OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE IFNULL(d.is_deleted, 0) = 0 AND d.dept_name = t.organization_name));
-- 2.20 结算调整单（仅 dept_name）
INSERT INTO blade_biz_dept_backfill_bak_20261104 (table_name, biz_id, old_dept_id, old_dept_name, new_dept_id, new_dept_name, create_user)
SELECT 'blade_settlement_adjustment', t.id, NULL, t.dept_name, c.dept_id, c.dept_name, t.create_user
FROM blade_settlement_adjustment t
INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
WHERE IFNULL(t.is_deleted, 0) = 0
AND (t.dept_name IS NULL OR TRIM(t.dept_name) = ''
OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE IFNULL(d.is_deleted, 0) = 0 AND d.dept_name = t.dept_name));
UPDATE blade_settlement_adjustment t
INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
SET t.dept_name = c.dept_name
WHERE IFNULL(t.is_deleted, 0) = 0
AND (t.dept_name IS NULL OR TRIM(t.dept_name) = ''
OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE IFNULL(d.is_deleted, 0) = 0 AND d.dept_name = t.dept_name));
COMMIT;
-- ----------------------------
-- 3. 校验（订正后执行）
-- ----------------------------
-- SELECT table_name, COUNT(*) AS bak_rows
-- FROM blade_biz_dept_backfill_bak_20261104
-- GROUP BY table_name
-- ORDER BY table_name;
--
-- -- 仍挂无效组织、且创建人当前有有效组织的运单（示例，期望 0）
-- SELECT COUNT(*) AS still_bad
-- FROM blade_waybill t
-- INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
-- WHERE IFNULL(t.is_deleted, 0) = 0
-- AND (t.dept_id IS NULL OR t.dept_id <= 0
-- OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
-- ----------------------------
-- 4. 回退（按备份表恢复；按需取消注释）
-- ----------------------------
-- UPDATE blade_waybill t
-- INNER JOIN blade_biz_dept_backfill_bak_20261104 b
-- ON b.table_name = 'blade_waybill' AND b.biz_id = t.id
-- SET t.dept_id = b.old_dept_id, t.dept_name = b.old_dept_name;
-- -- 其他表同理替换 table_name / 字段名
-- ----------------------------
-- 5. 可选：全量强制按创建人当前组织覆盖（不仅残留）
-- 默认不要执行；确认业务需要「全部改挂创建人当前组织」时再跑
-- ----------------------------
-- UPDATE blade_waybill t
-- INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
-- SET t.dept_id = c.dept_id, t.dept_name = c.dept_name
-- WHERE IFNULL(t.is_deleted, 0) = 0;
doc/sql/transport/blade_business_dept_config_20261102.sql
+38
View File
@@ -0,0 +1,38 @@
-- 业务部门配置：平台公司 + 业务部门 映射合同编号前缀、初始流水号、金蝶部门代码
CREATE TABLE IF NOT EXISTS `blade_business_dept_config` (
`id` bigint NOT NULL COMMENT '主键',
`tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '000000' COMMENT '租户ID',
`platform_company_id` bigint NOT NULL COMMENT '平台公司ID',
`platform_company_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '平台公司名称',
`business_dept_id` bigint NOT NULL COMMENT '业务部门ID',
`business_dept_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '业务部门名称',
`contract_code_prefix` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '合同编码前缀（平台公司简称+业务部门简称）',
`initial_serial` int DEFAULT NULL COMMENT '初始流水号（1-999，系统已有相同流水号则跳过）',
`kingdee_company_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '金蝶公司代码（取自平台公司组织金蝶代码）',
`kingdee_dept_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '金蝶部门代码',
`remark` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '备注',
`create_user` bigint DEFAULT NULL COMMENT '创建人',
`create_dept` bigint DEFAULT NULL COMMENT '创建部门',
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
`update_user` bigint DEFAULT NULL COMMENT '修改人',
`update_time` datetime DEFAULT NULL COMMENT '修改时间',
`status` int DEFAULT 1 COMMENT '状态',
`is_deleted` int DEFAULT 0 COMMENT '是否已删除',
PRIMARY KEY (`id`) USING BTREE,
KEY `idx_biz_dept_config_platform` (`platform_company_id`) USING BTREE,
KEY `idx_biz_dept_config_dept` (`business_dept_id`) USING BTREE,
KEY `idx_biz_dept_config_tenant` (`tenant_id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='业务部门配置';
-- 合同管理增加平台公司字段
ALTER TABLE `blade_contract_manage`
ADD COLUMN `platform_company_id` bigint DEFAULT NULL COMMENT '平台公司ID' AFTER `organization_name`,
ADD COLUMN `platform_company_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '平台公司' AFTER `platform_company_id`;
-- 系统管理菜单：业务部门配置
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES
(2080110200000000101, 1123598815738675203, 'business_dept_config', '业务部门配置', 'business_dept_config', '/system/business-dept-config', 'iconfont iconicon_group', 25, 1, 0, 1, NULL, '', 0),
(2080110200000000102, 2080110200000000101, 'business_dept_config_add', '新增', 'business_dept_config_add', '', '', 1, 2, 0, 1, NULL, '', 0),
(2080110200000000103, 2080110200000000101, 'business_dept_config_edit', '编辑', 'business_dept_config_edit', '', '', 2, 2, 0, 1, NULL, '', 0),
(2080110200000000104, 2080110200000000101, 'business_dept_config_delete', '删除', 'business_dept_config_delete', '', '', 3, 2, 0, 1, NULL, '', 0),
(2080110200000000105, 2080110200000000101, 'business_dept_config_view', '查看', 'business_dept_config_view', '', '', 4, 2, 0, 1, NULL, '', 0);
doc/sql/transport/blade_contract_party_multi_20261102.sql
+53
View File
@@ -0,0 +1,53 @@
-- 合同甲/乙/丙多方客商明细 + 运单/配载承运客商明细定位字段
-- utf8mb4_general_ci
-- 合同管理：多方客商 JSON 与丙方汇总
ALTER TABLE `blade_contract_manage`
ADD COLUMN `party_a_json` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '甲方客商明细JSON' AFTER `party_b`,
ADD COLUMN `party_b_json` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '乙方客商明细JSON' AFTER `party_a_json`,
ADD COLUMN `party_c_json` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '丙方客商明细JSON' AFTER `party_b_json`,
ADD COLUMN `party_c` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '丙方' AFTER `party_c_json`;
-- 合同变更：同步多方字段
ALTER TABLE `blade_contract_change`
ADD COLUMN `party_a_json` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '甲方客商明细JSON' AFTER `party_b`,
ADD COLUMN `party_b_json` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '乙方客商明细JSON' AFTER `party_a_json`,
ADD COLUMN `party_c_json` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '丙方客商明细JSON' AFTER `party_b_json`,
ADD COLUMN `party_c` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '丙方' AFTER `party_c_json`;
-- 历史数据迁移：原甲/乙方名称生成单行明细（仅名称，后续编辑补全客商ID）
UPDATE `blade_contract_manage`
SET `party_a_json` = CASE
WHEN `party_a` IS NOT NULL AND TRIM(`party_a`) <> '' AND (`party_a_json` IS NULL OR TRIM(`party_a_json`) = '')
THEN CONCAT('[{"id":"', REPLACE(UUID(), '-', ''), '","customerName":"', REPLACE(REPLACE(`party_a`, '\\', '\\\\'), '"', '\\"'), '"}]')
ELSE `party_a_json`
END,
`party_b_json` = CASE
WHEN `party_b` IS NOT NULL AND TRIM(`party_b`) <> '' AND (`party_b_json` IS NULL OR TRIM(`party_b_json`) = '')
THEN CONCAT('[{"id":"', REPLACE(UUID(), '-', ''), '","customerName":"', REPLACE(REPLACE(`party_b`, '\\', '\\\\'), '"', '\\"'), '"}]')
ELSE `party_b_json`
END
WHERE `is_deleted` = 0;
UPDATE `blade_contract_change`
SET `party_a_json` = CASE
WHEN `party_a` IS NOT NULL AND TRIM(`party_a`) <> '' AND (`party_a_json` IS NULL OR TRIM(`party_a_json`) = '')
THEN CONCAT('[{"id":"', REPLACE(UUID(), '-', ''), '","customerName":"', REPLACE(REPLACE(`party_a`, '\\', '\\\\'), '"', '\\"'), '"}]')
ELSE `party_a_json`
END,
`party_b_json` = CASE
WHEN `party_b` IS NOT NULL AND TRIM(`party_b`) <> '' AND (`party_b_json` IS NULL OR TRIM(`party_b_json`) = '')
THEN CONCAT('[{"id":"', REPLACE(UUID(), '-', ''), '","customerName":"', REPLACE(REPLACE(`party_b`, '\\', '\\\\'), '"', '\\"'), '"}]')
ELSE `party_b_json`
END
WHERE `is_deleted` = 0;
-- 运单：承运客商明细定位
ALTER TABLE `blade_waybill`
ADD COLUMN `carrier_party_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '承运客商明细行ID' AFTER `carrier_contract_id`,
ADD COLUMN `carrier_party_role` varchar(8) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '承运客商角色 B/C' AFTER `carrier_party_id`;
-- 配载：承运客商明细定位
ALTER TABLE `blade_loading_manage`
ADD COLUMN `carrier_party_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '承运客商明细行ID' AFTER `carrier_contract_id`,
ADD COLUMN `carrier_party_role` varchar(8) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '承运客商角色 B/C' AFTER `carrier_party_id`;
doc/sql/transport/blade_currency.sql
+1
View File
@@ -40,3 +40,4 @@ INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `s
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449000000000006, 2075449000000000001, 'currency_edit', '编辑', 'currency_edit', '', '', 1, 2, 0, 1, NULL, '', 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449000000000007, 2075449000000000001, 'currency_status', '修改状态', 'currency_status', '', '', 1, 2, 0, 1, NULL, '', 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449000000000008, 2075449000000000001, 'currency_add', '新增', 'currency_add', '', '', 1, 2, 0, 1, NULL, '', 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449000000000009, 2075449000000000001, 'currency_view', '查看', 'currency_view', '', '', 1, 2, 0, 1, NULL, '', 0);
doc/sql/transport/blade_customer_type.sql
+1
View File
@@ -26,3 +26,4 @@ INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `s
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449100000000003, 2075449100000000001, 'customer_type_edit', '编辑', 'customer_type_edit', '', '', 1, 2, 0, 1, NULL, '', 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449100000000004, 2075449100000000001, 'customer_type_status', '修改状态', 'customer_type_status', '', '', 1, 2, 0, 1, NULL, '', 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449100000000005, 2075449100000000001, 'customer_type_add', '新增', 'customer_type_add', '', '', 1, 2, 0, 1, NULL, '', 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449100000000006, 2075449100000000001, 'customer_type_view', '查看', 'customer_type_view', '', '', 1, 2, 0, 1, NULL, '', 0);
doc/sql/transport/blade_dept_tree_permission_patch_20261104.sql
+9
View File
@@ -0,0 +1,9 @@
-- ----------------------------
-- 组织树 /dept/tree 独立权限菜单（角色「数据权限」中配置）
-- 未配置该菜单数据权限时，组织树接口默认返回空（不展示）
-- ----------------------------
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`)
SELECT 2076110415738675232, 1123598815738675205, 'dept_tree', '树形结构', 'dept_tree', '/api/blade-system/dept/tree', 'file-text', 5, 2, 2, 1, '', '组织树接口独立数据权限配置项；未配置时组织树默认不展示', 0
FROM DUAL
WHERE NOT EXISTS (SELECT 1 FROM `blade_menu` WHERE `code` = 'dept_tree' AND `is_deleted` = 0);
doc/sql/transport/blade_fee_item.sql
+1
View File
@@ -33,3 +33,4 @@ INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `s
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449200000000006, 2075449200000000001, 'fee_item_import', '批量导入', 'fee_item_import', '/api/blade-system/fee-item/import-fee-item', 'upload', 5, 2, 3, 1, NULL, '', 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449200000000007, 2075449200000000001, 'fee_item_template', '下载模板', 'fee_item_template', '/api/blade-system/fee-item/export-template', 'download', 6, 2, 2, 1, NULL, '', 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449200000000008, 2075449200000000001, 'fee_item_export', '批量导出', 'fee_item_export', '/api/blade-system/fee-item/export-fee-item', 'download', 7, 2, 2, 1, NULL, '', 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449200000000009, 2075449200000000001, 'fee_item_view', '查看', 'fee_item_view', '', '', 1, 2, 0, 1, NULL, '', 0);
doc/sql/transport/blade_loading_manage_20260804.sql
+3 -1
View File
@@ -21,6 +21,7 @@ CREATE TABLE IF NOT EXISTS `blade_loading_manage` (
`trailer_vehicle_no` varchar(100) DEFAULT NULL COMMENT '挂车车牌号',
`driver_name` varchar(100) DEFAULT NULL COMMENT '司机',
`driver_phone` varchar(50) DEFAULT NULL COMMENT '联系电话',
`driver_id` bigint(20) DEFAULT NULL COMMENT '司机ID',
`escort_name` varchar(100) DEFAULT NULL COMMENT '押运人',
`escort_phone` varchar(50) DEFAULT NULL COMMENT '押运人手机号',
`carrier_type` varchar(50) DEFAULT NULL COMMENT '承运类型',
@@ -50,7 +51,8 @@ CREATE TABLE IF NOT EXISTS `blade_loading_manage` (
UNIQUE KEY `uk_loading_manage_no` (`loading_no`) USING BTREE,
KEY `idx_loading_manage_carrier_contract_id` (`carrier_contract_id`) USING BTREE,
KEY `idx_loading_manage_dept` (`dept_id`) USING BTREE,
KEY `idx_loading_manage_create_time` (`create_time`) USING BTREE
KEY `idx_loading_manage_create_time` (`create_time`) USING BTREE,
KEY `idx_loading_manage_tenant_driver_id` (`tenant_id`, `driver_id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='配载管理';
INSERT IGNORE INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES
doc/sql/transport/blade_loading_manage_driver_id_20261028.sql
+80
View File
@@ -0,0 +1,80 @@
-- ============================================================
-- blade_loading_manage_driver_id_20261028.sql
-- ============================================================
-- 运单/配载单写入司机档案 ID，把「归属」与「手机号快照」解耦：
-- blade_loading_manage.driver_id 配载单当前司机的司机档案 ID（blade_transport_driver.id）
-- blade_waybill.driver_id 已有列（本脚本只补索引），派单/配载/导入时写入
-- 归属判据：driver_id > 0 才算有主；0、-1 与 NULL 一律等同「无主」（承运商司机、未登录过小程序的司机）。
-- 历史数据不回填：手机号二次放号后按号反查会张冠李戴，旧单统一按无主处理，等下一次派单/配载再写入。
-- 本脚本只做结构升级，不改任何业务数据；以下结构变更可重复执行。
-- ------------------------------------------------------------
-- 0. 存档
-- ------------------------------------------------------------
-- 本脚本无数据订正，无需备份表。
-- ------------------------------------------------------------
-- 1. 结构变更
-- ------------------------------------------------------------
-- ① blade_loading_manage.driver_id
SET @ddl_sql = (
SELECT IF(COUNT(*) = 0,
'ALTER TABLE `blade_loading_manage` ADD COLUMN `driver_id` bigint(20) DEFAULT NULL COMMENT ''司机ID'' AFTER `driver_phone`',
'SELECT 1')
FROM information_schema.COLUMNS
WHERE TABLE_SCHEMA = DATABASE()
AND TABLE_NAME = 'blade_loading_manage'
AND COLUMN_NAME = 'driver_id'
);
PREPARE ddl_stmt FROM @ddl_sql;
EXECUTE ddl_stmt;
DEALLOCATE PREPARE ddl_stmt;
-- ② blade_loading_manage 按租户 + 司机归属检索（司机端/归属巡检）
SET @ddl_sql = (
SELECT IF(COUNT(*) = 0,
'ALTER TABLE `blade_loading_manage` ADD KEY `idx_loading_manage_tenant_driver_id` (`tenant_id`, `driver_id`) USING BTREE',
'SELECT 1')
FROM information_schema.STATISTICS
WHERE TABLE_SCHEMA = DATABASE()
AND TABLE_NAME = 'blade_loading_manage'
AND INDEX_NAME = 'idx_loading_manage_tenant_driver_id'
);
PREPARE ddl_stmt FROM @ddl_sql;
EXECUTE ddl_stmt;
DEALLOCATE PREPARE ddl_stmt;
-- ③ blade_waybill 按租户 + 司机归属检索（列已存在，只补索引）
SET @ddl_sql = (
SELECT IF(COUNT(*) = 0,
'ALTER TABLE `blade_waybill` ADD KEY `idx_waybill_tenant_driver_id` (`tenant_id`, `driver_id`) USING BTREE',
'SELECT 1')
FROM information_schema.STATISTICS
WHERE TABLE_SCHEMA = DATABASE()
AND TABLE_NAME = 'blade_waybill'
AND INDEX_NAME = 'idx_waybill_tenant_driver_id'
);
PREPARE ddl_stmt FROM @ddl_sql;
EXECUTE ddl_stmt;
DEALLOCATE PREPARE ddl_stmt;
-- ------------------------------------------------------------
-- 2. 校验
-- ------------------------------------------------------------
-- 列存在（期望 1 行）
-- SELECT COUNT(*) FROM information_schema.COLUMNS
-- WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'blade_loading_manage' AND COLUMN_NAME = 'driver_id';
-- 索引存在（期望 2 行）
-- SELECT TABLE_NAME, INDEX_NAME, COLUMN_NAME FROM information_schema.STATISTICS
-- WHERE TABLE_SCHEMA = DATABASE()
-- AND INDEX_NAME IN ('idx_loading_manage_tenant_driver_id', 'idx_waybill_tenant_driver_id')
-- ORDER BY TABLE_NAME, SEQ_IN_INDEX;
-- 归属分布（历史单 driver_id 应为空）
-- SELECT COUNT(*) AS total, SUM(driver_id IS NOT NULL AND driver_id > 0) AS owned FROM blade_waybill;
-- ------------------------------------------------------------
-- 3. 回退
-- ------------------------------------------------------------
-- ALTER TABLE `blade_waybill` DROP INDEX `idx_waybill_tenant_driver_id`;
-- ALTER TABLE `blade_loading_manage` DROP INDEX `idx_loading_manage_tenant_driver_id`;
-- ALTER TABLE `blade_loading_manage` DROP COLUMN `driver_id`;
doc/sql/transport/blade_loading_manage_driver_id_backfill_20261028.sql
+239
View File
@@ -0,0 +1,239 @@
-- ============================================================
-- blade_loading_manage_driver_id_backfill_20261028.sql
-- ============================================================
-- 存量配载单补司机档案 ID：把「归属」从手机号快照切到 blade_transport_driver.id
-- 写业务数据。第 0 节建存档表，第 1 节分批回填，第 2 节校验（只读，执行后必看），第 3 节回退。可重复执行。
--
-- 为什么要订正：
-- 票 01 之后配载单的归属键是 driver_id（blade_transport_driver.id），driver_phone 只是配载时的号码快照。
-- 存量配载单全部只有号码、没有 driver_id（票 01 才加的列），司机端按档案 ID 查配载单会一张都查不到；
-- 按号码反查又会踩二次放号与改号，所以才需要先按「唯一命中」把能确定的补齐。
-- 本脚本只处理「号码在本租户内唯一命中一条未删除档案」的配载单，其余留在原样、进清单等人工处置。
--
-- 判定与边界（严格按票面口径，不扩大）：
-- ① 只动 driver_id IS NULL 的行。driver_id = -1 是「无主」哨兵，正数表示已有归属，两者一行都不动；
-- 第 1 节的 WHERE 里另加了一道显式排除（(driver_id = -1) IS NOT TRUE），
-- 防止后人把条件放宽成 driver_id <= 0 时把哨兵一起覆盖。
-- ② 唯一命中：同租户内、is_deleted = 0、mobile 与 driver_phone 相等的档案恰好 1 条。
-- 命中 0 条 → 进「无法匹配」清单；命中 ≥2 条 → 进「冲突」清单。两类都跳过，不猜。
-- 逻辑删除的档案不参与命中：档案删了以后重跑脚本，不能把这些单挂到废弃档案上。
-- ③ 手机号为空、空白、含 * 的跳过（* 是脱敏占位，不是真号码）。
-- ④ driver_phone、update_time 与其它任何列都不改，只写 driver_id。
-- ⑤ 逻辑删除的配载单同样回填：票面口径只有 driver_id IS NULL，不额外收窄范围；
-- 这些单不会回到列表，回填对它们无副作用。
-- ⑥ 跨表比较显式 COLLATE：blade_loading_manage.driver_phone / tenant_id 是 utf8mb4_0900_ai_ci，
-- blade_transport_driver.mobile / tenant_id 与存档表都是 utf8mb4_general_ci；
-- 不显式 COLLATE 会抛 ERROR 1267 Illegal mix of collations，只有真跑库才会暴露。
-- 第 2.4 节拿存档表比 driver_phone 同样要带 COLLATE utf8mb4_0900_ai_ci。
-- ⑦ 取数与写入全在 SQL 内完成，不经 JSON / 客户端中转：19 位雪花 ID 过 JSON 会丢精度。
-- ⑧ 分批执行（默认每批 500 行），每批独立提交，中断后重跑从剩余 NULL 行继续。
--
-- 范围说明：与运单脚本同一口径，只做「手机号 → 档案唯一命中」这一条规则；其余留给人工处置。
-- 幂等：命中映射先落存档表；重复执行时映射新增 0 行、回填更新 0 行，结果不变（第 2.2 节校验）。
-- 执行方式（脚本里有 DELIMITER 与存储过程，按分号切句的 GUI 客户端会切错）：
-- mysql -h127.0.0.1 -uroot -p transport < blade_loading_manage_driver_id_backfill_20261028.sql
-- ------------------------------------------------------------
-- 0. 存档（必须在订正之前执行；重复执行不会覆盖已有存档）
-- ------------------------------------------------------------
-- 存档表同时是第 1 节的「命中映射」：一行 = 一个待回填的配载单 + 它唯一命中的档案 ID。
-- 回填前先把映射定下来：回填只按映射写，跑之前就能看出「打算填谁」，回退也按它还原。
CREATE TABLE IF NOT EXISTS blade_loading_manage_driver_id_bak_20261028 (
loading_id bigint NOT NULL COMMENT '配载单ID',
driver_id_before bigint DEFAULT NULL COMMENT '回填前的司机ID（本脚本只处理 NULL）',
driver_id_after bigint DEFAULT NULL COMMENT '回填写入的司机档案ID（blade_transport_driver.id）',
driver_phone varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '回填前的手机号快照，用来证明没有被改写',
update_time_before datetime DEFAULT NULL COMMENT '回填前的更新时间，用来证明没有被改写',
PRIMARY KEY (loading_id),
KEY idx_driver_id_after (driver_id_after)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='20261028 配载单司机档案ID回填存档';
-- 命中映射：只收「号码唯一命中一条未删除档案」的 NULL 行。
-- INSERT IGNORE + WHERE driver_id IS NULL：第二次执行不会重复建映射，已经填过的行不会再进映射。
INSERT IGNORE INTO blade_loading_manage_driver_id_bak_20261028 (loading_id, driver_id_before, driver_id_after, driver_phone, update_time_before)
SELECT matched.biz_id, NULL, matched.driver_id, matched.driver_phone, matched.update_time
FROM (
SELECT w.id AS biz_id,
MIN(d.id) AS driver_id,
w.driver_phone AS driver_phone,
w.update_time AS update_time
FROM blade_loading_manage w
JOIN blade_transport_driver d
ON d.tenant_id COLLATE utf8mb4_0900_ai_ci = w.tenant_id
AND d.mobile COLLATE utf8mb4_0900_ai_ci = w.driver_phone
AND d.is_deleted = 0
WHERE w.driver_id IS NULL
AND (w.driver_id = -1) IS NOT TRUE
AND w.driver_phone IS NOT NULL
AND TRIM(w.driver_phone) <> ''
AND w.driver_phone NOT LIKE '%*%'
GROUP BY w.id, w.driver_phone, w.update_time
HAVING COUNT(*) = 1
) matched;
-- ------------------------------------------------------------
-- 1. 订正（分批回填，默认每批 500 行）
-- ------------------------------------------------------------
-- 循环退出条件是「这一批没有更新任何行」，所以重复执行时第一批就是 0 行，脚本空转结束。
-- 每批单独提交（不开长事务）：大表上不会长时间持锁，中断后重跑从剩余 NULL 行继续。
DELIMITER $$
DROP PROCEDURE IF EXISTS backfill_blade_loading_manage_driver_id_20261028$$
CREATE PROCEDURE backfill_blade_loading_manage_driver_id_20261028(IN p_batch_size INT)
BEGIN
DECLARE v_batch_size INT DEFAULT 500;
DECLARE v_affected INT DEFAULT 0;
IF p_batch_size IS NOT NULL AND p_batch_size > 0 THEN
SET v_batch_size = p_batch_size;
END IF;
CREATE TEMPORARY TABLE IF NOT EXISTS tmp_loading_manage_driver_id_20261028 (
loading_id bigint NOT NULL,
PRIMARY KEY (loading_id)
) ENGINE = InnoDB;
REPEAT
-- 取批：只取还空着的行，填过的行不再入批，所以每一批都在推进，不会原地打转
DELETE FROM tmp_loading_manage_driver_id_20261028;
INSERT INTO tmp_loading_manage_driver_id_20261028 (loading_id)
SELECT b.loading_id
FROM blade_loading_manage_driver_id_bak_20261028 b
JOIN blade_loading_manage w ON w.id = b.loading_id
WHERE w.driver_id IS NULL
ORDER BY b.loading_id
LIMIT v_batch_size;
UPDATE blade_loading_manage w
JOIN blade_loading_manage_driver_id_bak_20261028 b ON b.loading_id = w.id
JOIN tmp_loading_manage_driver_id_20261028 t ON t.loading_id = w.id
SET w.driver_id = b.driver_id_after
WHERE w.driver_id IS NULL
AND (w.driver_id = -1) IS NOT TRUE
AND b.driver_id_after IS NOT NULL;
SET v_affected = ROW_COUNT();
UNTIL v_affected = 0 END REPEAT;
DROP TEMPORARY TABLE IF EXISTS tmp_loading_manage_driver_id_20261028;
END$$
DELIMITER ;
CALL backfill_blade_loading_manage_driver_id_20261028(500);
DROP PROCEDURE IF EXISTS backfill_blade_loading_manage_driver_id_20261028;
-- ------------------------------------------------------------
-- 2. 校验（执行后必看；本节只有 SELECT，不动数据）
-- ------------------------------------------------------------
-- 2.1 规模：存档多少行、还剩多少 NULL 行、正数归属多少行（跑前跑后各查一次）
-- remaining_null_rows 只会减少「本次命中」的那部分；差额应当等于第 2.7 节的命中行数。
SELECT COUNT(*) AS archived_rows FROM blade_loading_manage_driver_id_bak_20261028;
SELECT COUNT(*) AS remaining_null_rows FROM blade_loading_manage WHERE driver_id IS NULL;
SELECT SUM(driver_id > 0) AS owned_rows,
SUM(driver_id = -1) AS sentinel_rows,
SUM(driver_id IS NULL) AS null_rows
FROM blade_loading_manage;
-- 2.2 哨兵不变：跑前跑后各执行一次，四列必须完全相同（-1 一行都不能动）
SELECT COUNT(*) AS sentinel_rows,
SUM(id) AS sentinel_id_sum,
MIN(id) AS min_id,
MAX(id) AS max_id
FROM blade_loading_manage
WHERE driver_id = -1;
-- 2.3 写入正确：本次映射的行，driver_id 必须等于映射值（期望 0 行）
SELECT COUNT(*) AS wrong_driver_id
FROM blade_loading_manage_driver_id_bak_20261028 b
JOIN blade_loading_manage w ON w.id = b.loading_id
WHERE NOT (w.driver_id <=> b.driver_id_after);
-- 2.4 快照没有被改写：本次映射的行，driver_phone 与 update_time 必须与存档逐行一致（期望 0 行）
SELECT COUNT(*) AS snapshot_rewritten
FROM blade_loading_manage_driver_id_bak_20261028 b
JOIN blade_loading_manage w ON w.id = b.loading_id
WHERE NOT (w.driver_phone <=> b.driver_phone COLLATE utf8mb4_0900_ai_ci)
OR NOT (w.update_time <=> b.update_time_before);
-- 2.5 冲突清单：同号多档案，这些行被跳过（期望 0 行；有输出就是「为什么没填」的答案）
SELECT w.driver_phone AS conflicting_phone,
COUNT(DISTINCT w.id) AS pending_rows,
COUNT(DISTINCT d.id) AS driver_profiles,
GROUP_CONCAT(DISTINCT d.id ORDER BY d.id) AS driver_profile_ids
FROM blade_loading_manage w
JOIN blade_transport_driver d
ON d.tenant_id COLLATE utf8mb4_0900_ai_ci = w.tenant_id
AND d.mobile COLLATE utf8mb4_0900_ai_ci = w.driver_phone
AND d.is_deleted = 0
WHERE w.driver_id IS NULL
AND (w.driver_id = -1) IS NOT TRUE
AND w.driver_phone IS NOT NULL
AND TRIM(w.driver_phone) <> ''
AND w.driver_phone NOT LIKE '%*%'
GROUP BY w.driver_phone
HAVING COUNT(DISTINCT d.id) > 1;
-- 2.6 无法匹配清单：号码在本租户内命中 0 条档案，这些行按规则跳过（等人工处置，脚本不猜）
SELECT w.driver_phone AS unmatched_phone,
COUNT(*) AS pending_rows
FROM blade_loading_manage w
WHERE w.driver_id IS NULL
AND (w.driver_id = -1) IS NOT TRUE
AND w.driver_phone IS NOT NULL
AND TRIM(w.driver_phone) <> ''
AND w.driver_phone NOT LIKE '%*%'
AND NOT EXISTS (
SELECT 1
FROM blade_transport_driver d
WHERE d.tenant_id COLLATE utf8mb4_0900_ai_ci = w.tenant_id
AND d.mobile COLLATE utf8mb4_0900_ai_ci = w.driver_phone
AND d.is_deleted = 0)
GROUP BY w.driver_phone
ORDER BY pending_rows DESC, unmatched_phone;
-- 2.7 逐司机对照：按手机号可见单量 vs 按档案 ID 可见单量
-- by_phone = 号码快照等于该档案号码的单量（旧口径，改号/二次放号会串）
-- by_driver_id = 档案 ID 等于该档案的单量（新口径）
-- phone_only_null = 号码对上、但归属还空着的单（本次应被回填的那部分）
-- phone_only_sentinel = 号码对上、但归属被标成 -1 无主的单（回填不碰，需要人工确认）
-- phone_only_other_owner = 号码对上、却已归属另一条档案的单（改号/换司机后号码被复用）
-- id_only_phone_differs = 已归属该档案、但号码快照不是该档案当前号码的单（改号后的历史快照）
SELECT d.id AS driver_id,
d.driver_name,
d.mobile,
(SELECT COUNT(*) FROM blade_loading_manage w WHERE w.driver_id = d.id) AS by_driver_id,
(SELECT COUNT(*) FROM blade_loading_manage w
WHERE w.tenant_id COLLATE utf8mb4_0900_ai_ci = d.tenant_id
AND w.driver_phone COLLATE utf8mb4_0900_ai_ci = d.mobile) AS by_phone,
(SELECT COUNT(*) FROM blade_loading_manage w
WHERE w.tenant_id COLLATE utf8mb4_0900_ai_ci = d.tenant_id
AND w.driver_phone COLLATE utf8mb4_0900_ai_ci = d.mobile
AND w.driver_id IS NULL) AS phone_only_null,
(SELECT COUNT(*) FROM blade_loading_manage w
WHERE w.tenant_id COLLATE utf8mb4_0900_ai_ci = d.tenant_id
AND w.driver_phone COLLATE utf8mb4_0900_ai_ci = d.mobile
AND w.driver_id = -1) AS phone_only_sentinel,
(SELECT COUNT(*) FROM blade_loading_manage w
WHERE w.tenant_id COLLATE utf8mb4_0900_ai_ci = d.tenant_id
AND w.driver_phone COLLATE utf8mb4_0900_ai_ci = d.mobile
AND w.driver_id > 0
AND w.driver_id <> d.id) AS phone_only_other_owner,
(SELECT COUNT(*) FROM blade_loading_manage w
WHERE w.driver_id = d.id
AND (w.driver_phone IS NULL
OR NOT (w.driver_phone COLLATE utf8mb4_0900_ai_ci = d.mobile))) AS id_only_phone_differs
FROM blade_transport_driver d
WHERE d.is_deleted = 0
ORDER BY by_phone DESC, by_driver_id DESC, driver_id;
-- ------------------------------------------------------------
-- 3. 回退（仅在需要撤销本次回填时手工执行）
-- ------------------------------------------------------------
-- 按存档表把本次写入的行还原成 NULL。只还原「当前值仍等于本次写入值」的行：
-- 回填之后又被人改派过的单不会被冲掉。
-- UPDATE blade_loading_manage w
-- JOIN blade_loading_manage_driver_id_bak_20261028 b ON b.loading_id = w.id
-- SET w.driver_id = b.driver_id_before
-- WHERE w.driver_id <=> b.driver_id_after;
-- 回退只碰 driver_id，不碰 driver_phone / update_time。备份表确认不再需要时再删：
-- DROP TABLE blade_loading_manage_driver_id_bak_20261028;
doc/sql/transport/blade_measurement_unit.sql
+2 -1
View File
@@ -30,4 +30,5 @@ INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `s
(2075449300000000002, 2075449300000000001, 'measurement_unit_delete', '删除', 'measurement_unit_delete', '', '', 1, 2, 0, 1, NULL, '', 0),
(2075449300000000003, 2075449300000000001, 'measurement_unit_edit', '编辑', 'measurement_unit_edit', '', '', 1, 2, 0, 1, NULL, '', 0),
(2075449300000000004, 2075449300000000001, 'measurement_unit_status', '修改状态', 'measurement_unit_status', '', '', 1, 2, 0, 1, NULL, '', 0),
(2075449300000000005, 2075449300000000001, 'measurement_unit_add', '新增', 'measurement_unit_add', '', '', 1, 2, 0, 1, NULL, '', 0);
(2075449300000000005, 2075449300000000001, 'measurement_unit_add', '新增', 'measurement_unit_add', '', '', 1, 2, 0, 1, NULL, '', 0),
(2075449300000000006, 2075449300000000001, 'measurement_unit_view', '查看', 'measurement_unit_view', '', '', 1, 2, 0, 1, NULL, '', 0);
doc/sql/transport/blade_tms_business.sql
+5 -2
View File
@@ -300,7 +300,8 @@ CREATE TABLE `blade_waybill` (
KEY `idx_waybill_dept` (`dept_id`) USING BTREE,
KEY `idx_waybill_plan_id` (`plan_id`) USING BTREE,
KEY `idx_waybill_carrier_contract_id` (`carrier_contract_id`) USING BTREE,
KEY `idx_waybill_create_time` (`create_time`) USING BTREE
KEY `idx_waybill_create_time` (`create_time`) USING BTREE,
KEY `idx_waybill_tenant_driver_id` (`tenant_id`,`driver_id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='运单管理';
-- ----------------------------
@@ -330,6 +331,7 @@ CREATE TABLE `blade_loading_manage` (
`trailer_vehicle_no` varchar(100) DEFAULT NULL COMMENT '挂车车牌号',
`driver_name` varchar(100) DEFAULT NULL COMMENT '司机',
`driver_phone` varchar(50) DEFAULT NULL COMMENT '联系电话',
`driver_id` bigint(20) DEFAULT NULL COMMENT '司机ID',
`escort_name` varchar(100) DEFAULT NULL COMMENT '押运人',
`escort_phone` varchar(50) DEFAULT NULL COMMENT '押运人手机号',
`carrier_type` varchar(50) DEFAULT NULL COMMENT '承运类型',
@@ -359,7 +361,8 @@ CREATE TABLE `blade_loading_manage` (
UNIQUE KEY `uk_loading_manage_no` (`loading_no`) USING BTREE,
KEY `idx_loading_manage_carrier_contract_id` (`carrier_contract_id`) USING BTREE,
KEY `idx_loading_manage_dept` (`dept_id`) USING BTREE,
KEY `idx_loading_manage_create_time` (`create_time`) USING BTREE
KEY `idx_loading_manage_create_time` (`create_time`) USING BTREE,
KEY `idx_loading_manage_tenant_driver_id` (`tenant_id`,`driver_id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='配载管理';
-- ----------------------------
doc/sql/transport/blade_transport_cert_record_20261002.sql
+1
View File
@@ -14,6 +14,7 @@ CREATE TABLE IF NOT EXISTS `blade_transport_cert_record` (
`biz_key` varchar(100) DEFAULT NULL COMMENT '展示键：司机姓名/车牌号',
`status` int(11) NOT NULL COMMENT '审核状态：0审核中 1已通过 2已驳回 3已作废',
`snapshot_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '该次提交的全量认证内容JSON，一经创建不可修改',
`audited_snapshot_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '审核通过时确定的修订版内容；NULL=未修订',
`reject_reason` varchar(200) DEFAULT NULL COMMENT '驳回原因，仅状态为已驳回时有值',
`submit_time` datetime DEFAULT NULL COMMENT '提交时间',
`submit_user` bigint(20) DEFAULT NULL COMMENT '提交人',
doc/sql/transport/blade_transport_cert_record_audit_revision_20261028.sql
+68
View File
@@ -0,0 +1,68 @@
-- ----------------------------
-- 认证记录：新增修订版快照列 audited_snapshot_json（2026-10-28）
-- ----------------------------
-- 背景：审核员可以在审核页面对提交内容做修订（全字段可改，身份字段除外）。
-- 修订结果必须留痕：snapshot_json 是「司机当时提交了什么」，一经创建逐字节不可改；
-- 修订版另存一列，「审核通过时到底认定了什么内容」才查得清。
--
-- 语义：
-- NULL —— 未修订，生效内容即 snapshot_json；
-- 非 NULL —— 审核通过时认定的修订版全量 JSON，生效内容以它为准。
-- 只在「通过」时同事务写入；驳回不写（驳回不产生生效内容，留修订版只会让人误读）。
-- 修订人/修订时间复用 audit_user / audit_time，不新增列。
--
-- 只做结构变更，不回填数据：存量记录一律保持 NULL（历史审核确实没有修订动作）。
--
-- 不加索引：本列只在审核详情与生效内容读取时按主键取用，从不作为查询条件；
-- longtext 建索引会超出索引键长度并拖慢写入。
--
-- 幂等：先查 information_schema 判列，列已存在（或类型/可空性已符合）即跳过；
-- 只用 PREPARE 动态语句、不用存储过程，因此不需要 DELIMITER——按分号逐句切分的
-- 客户端（含数据库驱动）也能直接执行。重复执行零变更。
SET @cert_record_schema = DATABASE();
-- ----------------------------
-- 0. 表存在性守卫
-- ----------------------------
-- 表不存在时故意执行一条只读查询，让客户端报 1146「Table ... doesn't exist」；
-- 否则下面因查不到列而静默跳过，脚本会假绿。
SET @cert_record_guard_sql = (
SELECT IF(COUNT(*) > 0,
'SELECT 1',
'SELECT 1 FROM `blade_transport_cert_record` LIMIT 0')
FROM information_schema.tables
WHERE table_schema = @cert_record_schema
AND table_name = 'blade_transport_cert_record'
);
PREPARE cert_record_guard_stmt FROM @cert_record_guard_sql;
EXECUTE cert_record_guard_stmt;
DEALLOCATE PREPARE cert_record_guard_stmt;
-- ----------------------------
-- 1. 加列 audited_snapshot_json
-- ----------------------------
-- 位置紧接 snapshot_json：两列是同一份内容的前后两态，放一起便于对照。
-- 条件分三种：列不存在则 ADD；列存在但类型不是 longtext 或可空性不是 YES 则 MODIFY
-- （防止历史上的手工变更把列建成 varchar 而截断 JSON）；其余情况跳过。
SET @cert_record_audited_snapshot_sql = (
SELECT IF(COUNT(*) = 0,
'ALTER TABLE `blade_transport_cert_record` ADD COLUMN `audited_snapshot_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT ''审核通过时确定的修订版内容；NULL=未修订'' AFTER `snapshot_json`',
IF(SUM(data_type <> 'longtext' OR is_nullable <> 'YES') > 0,
'ALTER TABLE `blade_transport_cert_record` MODIFY COLUMN `audited_snapshot_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT ''审核通过时确定的修订版内容；NULL=未修订''',
'SELECT 1'))
FROM information_schema.columns
WHERE table_schema = @cert_record_schema
AND table_name = 'blade_transport_cert_record'
AND column_name = 'audited_snapshot_json'
);
PREPARE cert_record_audited_snapshot_stmt FROM @cert_record_audited_snapshot_sql;
EXECUTE cert_record_audited_snapshot_stmt;
DEALLOCATE PREPARE cert_record_audited_snapshot_stmt;
-- ----------------------------
-- 2. 回滚
-- ----------------------------
-- 只新增了一列、未进任何索引，回滚即删该列；
-- snapshot_json 的 updateStrategy=NEVER 与生成列 pending_biz_id、唯一键 uk_cert_record_pending 均不受影响：
-- ALTER TABLE `blade_transport_cert_record` DROP COLUMN `audited_snapshot_json`;
doc/sql/transport/blade_vehicle_maintenance_record.sql
+3 -1
View File
@@ -7,6 +7,7 @@ CREATE TABLE `blade_vehicle_maintenance_record` (
`tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户ID',
`vehicle_type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '车船类型',
`vehicle_no` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '车牌号/船号',
`exception_id` bigint NULL DEFAULT NULL COMMENT '关联异常处置ID（小程序录入时写入）',
`maintainer` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '维修人',
`maintenance_time` datetime NOT NULL COMMENT '维修时间',
`location` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '维修位置',
@@ -29,5 +30,6 @@ CREATE TABLE `blade_vehicle_maintenance_record` (
`is_deleted` int NULL DEFAULT 0 COMMENT '是否已删除',
PRIMARY KEY (`id`) USING BTREE,
INDEX `idx_vehicle_maintenance_record_no`(`vehicle_no`) USING BTREE,
INDEX `idx_vehicle_maintenance_record_time`(`maintenance_time`) USING BTREE
INDEX `idx_vehicle_maintenance_record_time`(`maintenance_time`) USING BTREE,
UNIQUE INDEX `uk_vehicle_maintenance_record_exception`(`exception_id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '车辆维修记录';
doc/sql/transport/blade_vehicle_maintenance_record_exception_20261029.sql
+35
View File
@@ -0,0 +1,35 @@
-- 维修记录关联异常处置
-- 日期：2026-10-29
-- 小程序调度端在「车辆故障维修」类异常下录入维修记录，记录通过 exception_id 关联该条异常。
-- 一条异常至多一条维修记录，故建唯一索引；唯一索引允许多个 NULL，PC 手工录入/导入的记录不受影响。
DELIMITER $$
DROP PROCEDURE IF EXISTS `upgrade_blade_vehicle_maintenance_record_exception_20261029`$$
CREATE PROCEDURE `upgrade_blade_vehicle_maintenance_record_exception_20261029`()
BEGIN
DECLARE db_name varchar(128);
SET db_name = DATABASE();
IF NOT EXISTS (SELECT 1 FROM information_schema.columns
WHERE table_schema = db_name
AND table_name = 'blade_vehicle_maintenance_record'
AND column_name = 'exception_id') THEN
ALTER TABLE `blade_vehicle_maintenance_record`
ADD COLUMN `exception_id` bigint NULL DEFAULT NULL COMMENT '关联异常处置ID（小程序录入时写入）'
AFTER `vehicle_no`;
END IF;
IF NOT EXISTS (SELECT 1 FROM information_schema.statistics
WHERE table_schema = db_name
AND table_name = 'blade_vehicle_maintenance_record'
AND index_name = 'uk_vehicle_maintenance_record_exception') THEN
ALTER TABLE `blade_vehicle_maintenance_record`
ADD UNIQUE INDEX `uk_vehicle_maintenance_record_exception`(`exception_id`) USING BTREE;
END IF;
END$$
CALL `upgrade_blade_vehicle_maintenance_record_exception_20261029`()$$
DROP PROCEDURE `upgrade_blade_vehicle_maintenance_record_exception_20261029`$$
DELIMITER ;
doc/sql/transport/blade_waybill_driver_id_backfill_20261028.sql
+242
View File
@@ -0,0 +1,242 @@
-- ============================================================
-- blade_waybill_driver_id_backfill_20261028.sql
-- ============================================================
-- 存量运单补司机档案 ID：把「归属」从手机号快照切到 blade_transport_driver.id
-- 写业务数据。第 0 节建存档表，第 1 节分批回填，第 2 节校验（只读，执行后必看），第 3 节回退。可重复执行。
--
-- 为什么要订正：
-- 票 01 之后运单的归属键是 driver_id（blade_transport_driver.id），driver_phone 只是派单时的号码快照。
-- 存量运单大多只有号码、没有 driver_id，司机端按档案 ID 查单会整批漏掉它们；
-- 按号码反查又会踩二次放号与改号（本机库实测：黄宇富档案已改号 15577122721，
-- 名下 92 张单仍写着旧号 17587421208，其中 20 张 driver_id 为空、5 张能从接单司机推出来，
-- 剩下 15 张号码已经对不上任何档案——本脚本不猜，它们会出现在第 2.6 节清单里）。
-- 本脚本只处理「号码在本租户内唯一命中一条未删除档案」的运单，其余留在原样、进清单等人工处置。
--
-- 判定与边界（严格按票面口径，不扩大）：
-- ① 只动 driver_id IS NULL 的行。driver_id = -1 是「无主」哨兵，正数表示已有归属，两者一行都不动；
-- 第 1 节的 WHERE 里另加了一道显式排除（(driver_id = -1) IS NOT TRUE），
-- 防止后人把条件放宽成 driver_id <= 0 时把哨兵一起覆盖。
-- ② 唯一命中：同租户内、is_deleted = 0、mobile 与 driver_phone 相等的档案恰好 1 条。
-- 命中 0 条 → 进「无法匹配」清单；命中 ≥2 条 → 进「冲突」清单。两类都跳过，不猜。
-- 逻辑删除的档案不参与命中：档案删了以后重跑脚本，不能把这些单挂到废弃档案上。
-- ③ 手机号为空、空白、含 * 的跳过（* 是脱敏占位，不是真号码）。
-- ④ driver_phone、update_time 与其它任何列都不改，只写 driver_id。
-- ⑤ 逻辑删除的运单同样回填：票面口径只有 driver_id IS NULL，不额外收窄范围；
-- 这些单不会回到列表，回填对它们无副作用。
-- ⑥ 跨表比较显式 COLLATE：blade_waybill.driver_phone / tenant_id 是 utf8mb4_0900_ai_ci，
-- blade_transport_driver.mobile / tenant_id 与存档表都是 utf8mb4_general_ci；
-- 不显式 COLLATE 会抛 ERROR 1267 Illegal mix of collations，只有真跑库才会暴露。
-- 第 2.4 节拿存档表比 driver_phone 同样要带 COLLATE utf8mb4_0900_ai_ci。
-- ⑦ 取数与写入全在 SQL 内完成，不经 JSON / 客户端中转：19 位雪花 ID 过 JSON 会丢精度。
-- ⑧ 分批执行（默认每批 500 行），每批独立提交，中断后重跑从剩余 NULL 行继续。
--
-- 范围说明：本脚本只做「手机号 → 档案唯一命中」这一条规则。
-- 不引入 driver_accept_driver_id 推断，也不按姓名/历史号码猜归属：这些属于人工处置，在票面范围外。
-- 幂等：命中映射先落存档表；重复执行时映射新增 0 行、回填更新 0 行，结果不变（第 2.2 节校验）。
-- 执行方式（脚本里有 DELIMITER 与存储过程，按分号切句的 GUI 客户端会切错）：
-- mysql -h127.0.0.1 -uroot -p transport < blade_waybill_driver_id_backfill_20261028.sql
-- ------------------------------------------------------------
-- 0. 存档（必须在订正之前执行；重复执行不会覆盖已有存档）
-- ------------------------------------------------------------
-- 存档表同时是第 1 节的「命中映射」：一行 = 一个待回填的运单 + 它唯一命中的档案 ID。
-- 回填前先把映射定下来：回填只按映射写，跑之前就能看出「打算填谁」，回退也按它还原。
CREATE TABLE IF NOT EXISTS blade_waybill_driver_id_bak_20261028 (
waybill_id bigint NOT NULL COMMENT '运单ID',
driver_id_before bigint DEFAULT NULL COMMENT '回填前的司机ID（本脚本只处理 NULL）',
driver_id_after bigint DEFAULT NULL COMMENT '回填写入的司机档案ID（blade_transport_driver.id）',
driver_phone varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '回填前的手机号快照，用来证明没有被改写',
update_time_before datetime DEFAULT NULL COMMENT '回填前的更新时间，用来证明没有被改写',
PRIMARY KEY (waybill_id),
KEY idx_driver_id_after (driver_id_after)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='20261028 运单司机档案ID回填存档';
-- 命中映射：只收「号码唯一命中一条未删除档案」的 NULL 行。
-- INSERT IGNORE + WHERE driver_id IS NULL：第二次执行不会重复建映射，已经填过的行不会再进映射。
INSERT IGNORE INTO blade_waybill_driver_id_bak_20261028 (waybill_id, driver_id_before, driver_id_after, driver_phone, update_time_before)
SELECT matched.biz_id, NULL, matched.driver_id, matched.driver_phone, matched.update_time
FROM (
SELECT w.id AS biz_id,
MIN(d.id) AS driver_id,
w.driver_phone AS driver_phone,
w.update_time AS update_time
FROM blade_waybill w
JOIN blade_transport_driver d
ON d.tenant_id COLLATE utf8mb4_0900_ai_ci = w.tenant_id
AND d.mobile COLLATE utf8mb4_0900_ai_ci = w.driver_phone
AND d.is_deleted = 0
WHERE w.driver_id IS NULL
AND (w.driver_id = -1) IS NOT TRUE
AND w.driver_phone IS NOT NULL
AND TRIM(w.driver_phone) <> ''
AND w.driver_phone NOT LIKE '%*%'
GROUP BY w.id, w.driver_phone, w.update_time
HAVING COUNT(*) = 1
) matched;
-- ------------------------------------------------------------
-- 1. 订正（分批回填，默认每批 500 行）
-- ------------------------------------------------------------
-- 循环退出条件是「这一批没有更新任何行」，所以重复执行时第一批就是 0 行，脚本空转结束。
-- 每批单独提交（不开长事务）：大表上不会长时间持锁，中断后重跑从剩余 NULL 行继续。
DELIMITER $$
DROP PROCEDURE IF EXISTS backfill_blade_waybill_driver_id_20261028$$
CREATE PROCEDURE backfill_blade_waybill_driver_id_20261028(IN p_batch_size INT)
BEGIN
DECLARE v_batch_size INT DEFAULT 500;
DECLARE v_affected INT DEFAULT 0;
IF p_batch_size IS NOT NULL AND p_batch_size > 0 THEN
SET v_batch_size = p_batch_size;
END IF;
CREATE TEMPORARY TABLE IF NOT EXISTS tmp_waybill_driver_id_20261028 (
waybill_id bigint NOT NULL,
PRIMARY KEY (waybill_id)
) ENGINE = InnoDB;
REPEAT
-- 取批：只取还空着的行，填过的行不再入批，所以每一批都在推进，不会原地打转
DELETE FROM tmp_waybill_driver_id_20261028;
INSERT INTO tmp_waybill_driver_id_20261028 (waybill_id)
SELECT b.waybill_id
FROM blade_waybill_driver_id_bak_20261028 b
JOIN blade_waybill w ON w.id = b.waybill_id
WHERE w.driver_id IS NULL
ORDER BY b.waybill_id
LIMIT v_batch_size;
UPDATE blade_waybill w
JOIN blade_waybill_driver_id_bak_20261028 b ON b.waybill_id = w.id
JOIN tmp_waybill_driver_id_20261028 t ON t.waybill_id = w.id
SET w.driver_id = b.driver_id_after
WHERE w.driver_id IS NULL
AND (w.driver_id = -1) IS NOT TRUE
AND b.driver_id_after IS NOT NULL;
SET v_affected = ROW_COUNT();
UNTIL v_affected = 0 END REPEAT;
DROP TEMPORARY TABLE IF EXISTS tmp_waybill_driver_id_20261028;
END$$
DELIMITER ;
CALL backfill_blade_waybill_driver_id_20261028(500);
DROP PROCEDURE IF EXISTS backfill_blade_waybill_driver_id_20261028;
-- ------------------------------------------------------------
-- 2. 校验（执行后必看；本节只有 SELECT，不动数据）
-- ------------------------------------------------------------
-- 2.1 规模：存档多少行、还剩多少 NULL 行、正数归属多少行（跑前跑后各查一次）
-- remaining_null_rows 只会减少「本次命中」的那部分；差额应当等于第 2.7 节的命中行数。
SELECT COUNT(*) AS archived_rows FROM blade_waybill_driver_id_bak_20261028;
SELECT COUNT(*) AS remaining_null_rows FROM blade_waybill WHERE driver_id IS NULL;
SELECT SUM(driver_id > 0) AS owned_rows,
SUM(driver_id = -1) AS sentinel_rows,
SUM(driver_id IS NULL) AS null_rows
FROM blade_waybill;
-- 2.2 哨兵不变：跑前跑后各执行一次，四列必须完全相同（-1 一行都不能动）
SELECT COUNT(*) AS sentinel_rows,
SUM(id) AS sentinel_id_sum,
MIN(id) AS min_id,
MAX(id) AS max_id
FROM blade_waybill
WHERE driver_id = -1;
-- 2.3 写入正确：本次映射的行，driver_id 必须等于映射值（期望 0 行）
SELECT COUNT(*) AS wrong_driver_id
FROM blade_waybill_driver_id_bak_20261028 b
JOIN blade_waybill w ON w.id = b.waybill_id
WHERE NOT (w.driver_id <=> b.driver_id_after);
-- 2.4 快照没有被改写：本次映射的行，driver_phone 与 update_time 必须与存档逐行一致（期望 0 行）
SELECT COUNT(*) AS snapshot_rewritten
FROM blade_waybill_driver_id_bak_20261028 b
JOIN blade_waybill w ON w.id = b.waybill_id
WHERE NOT (w.driver_phone <=> b.driver_phone COLLATE utf8mb4_0900_ai_ci)
OR NOT (w.update_time <=> b.update_time_before);
-- 2.5 冲突清单：同号多档案，这些行被跳过（期望 0 行；有输出就是「为什么没填」的答案）
SELECT w.driver_phone AS conflicting_phone,
COUNT(DISTINCT w.id) AS pending_rows,
COUNT(DISTINCT d.id) AS driver_profiles,
GROUP_CONCAT(DISTINCT d.id ORDER BY d.id) AS driver_profile_ids
FROM blade_waybill w
JOIN blade_transport_driver d
ON d.tenant_id COLLATE utf8mb4_0900_ai_ci = w.tenant_id
AND d.mobile COLLATE utf8mb4_0900_ai_ci = w.driver_phone
AND d.is_deleted = 0
WHERE w.driver_id IS NULL
AND (w.driver_id = -1) IS NOT TRUE
AND w.driver_phone IS NOT NULL
AND TRIM(w.driver_phone) <> ''
AND w.driver_phone NOT LIKE '%*%'
GROUP BY w.driver_phone
HAVING COUNT(DISTINCT d.id) > 1;
-- 2.6 无法匹配清单：号码在本租户内命中 0 条档案，这些行按规则跳过（等人工处置，脚本不猜）
SELECT w.driver_phone AS unmatched_phone,
COUNT(*) AS pending_rows
FROM blade_waybill w
WHERE w.driver_id IS NULL
AND (w.driver_id = -1) IS NOT TRUE
AND w.driver_phone IS NOT NULL
AND TRIM(w.driver_phone) <> ''
AND w.driver_phone NOT LIKE '%*%'
AND NOT EXISTS (
SELECT 1
FROM blade_transport_driver d
WHERE d.tenant_id COLLATE utf8mb4_0900_ai_ci = w.tenant_id
AND d.mobile COLLATE utf8mb4_0900_ai_ci = w.driver_phone
AND d.is_deleted = 0)
GROUP BY w.driver_phone
ORDER BY pending_rows DESC, unmatched_phone;
-- 2.7 逐司机对照：按手机号可见单量 vs 按档案 ID 可见单量
-- by_phone = 号码快照等于该档案号码的单量（旧口径，改号/二次放号会串）
-- by_driver_id = 档案 ID 等于该档案的单量（新口径）
-- phone_only_null = 号码对上、但归属还空着的单（本次应被回填的那部分）
-- phone_only_sentinel = 号码对上、但归属被标成 -1 无主的单（回填不碰，需要人工确认）
-- phone_only_other_owner = 号码对上、却已归属另一条档案的单（改号/换司机后号码被复用）
-- id_only_phone_differs = 已归属该档案、但号码快照不是该档案当前号码的单（改号后的历史快照）
SELECT d.id AS driver_id,
d.driver_name,
d.mobile,
(SELECT COUNT(*) FROM blade_waybill w WHERE w.driver_id = d.id) AS by_driver_id,
(SELECT COUNT(*) FROM blade_waybill w
WHERE w.tenant_id COLLATE utf8mb4_0900_ai_ci = d.tenant_id
AND w.driver_phone COLLATE utf8mb4_0900_ai_ci = d.mobile) AS by_phone,
(SELECT COUNT(*) FROM blade_waybill w
WHERE w.tenant_id COLLATE utf8mb4_0900_ai_ci = d.tenant_id
AND w.driver_phone COLLATE utf8mb4_0900_ai_ci = d.mobile
AND w.driver_id IS NULL) AS phone_only_null,
(SELECT COUNT(*) FROM blade_waybill w
WHERE w.tenant_id COLLATE utf8mb4_0900_ai_ci = d.tenant_id
AND w.driver_phone COLLATE utf8mb4_0900_ai_ci = d.mobile
AND w.driver_id = -1) AS phone_only_sentinel,
(SELECT COUNT(*) FROM blade_waybill w
WHERE w.tenant_id COLLATE utf8mb4_0900_ai_ci = d.tenant_id
AND w.driver_phone COLLATE utf8mb4_0900_ai_ci = d.mobile
AND w.driver_id > 0
AND w.driver_id <> d.id) AS phone_only_other_owner,
(SELECT COUNT(*) FROM blade_waybill w
WHERE w.driver_id = d.id
AND (w.driver_phone IS NULL
OR NOT (w.driver_phone COLLATE utf8mb4_0900_ai_ci = d.mobile))) AS id_only_phone_differs
FROM blade_transport_driver d
WHERE d.is_deleted = 0
ORDER BY by_phone DESC, by_driver_id DESC, driver_id;
-- ------------------------------------------------------------
-- 3. 回退（仅在需要撤销本次回填时手工执行）
-- ------------------------------------------------------------
-- 按存档表把本次写入的行还原成 NULL。只还原「当前值仍等于本次写入值」的行：
-- 回填之后又被人改派过的单不会被冲掉。
-- UPDATE blade_waybill w
-- JOIN blade_waybill_driver_id_bak_20261028 b ON b.waybill_id = w.id
-- SET w.driver_id = b.driver_id_before
-- WHERE w.driver_id <=> b.driver_id_after;
-- 回退只碰 driver_id，不碰 driver_phone / update_time。备份表确认不再需要时再删：
-- DROP TABLE blade_waybill_driver_id_bak_20261028;
doc/sql/transport/lqj/20261028/01_blade_payment_application_kingdee_fail_reason_20261028.sql → doc/sql/transport/lqj/20261102/01_blade_payment_application_kingdee_fail_reason_20261028.sql
View File
doc/sql/transport/lqj/20261027/01_blade_payment_spec_attach_fd_id_20261027.sql → doc/sql/transport/lqj/20261102/01_blade_payment_spec_attach_fd_id_20261027.sql
View File
doc/sql/transport/lqj/20261028/01_blade_receipt_claim_hcs_record_20261028.sql → doc/sql/transport/lqj/20261102/01_blade_receipt_claim_hcs_record_20261028.sql
View File
doc/sql/transport/lqj/temp/02_blade_customer_archive_hcs_risk_20261030.sql → doc/sql/transport/lqj/20261102/02_blade_customer_archive_hcs_risk_20261030.sql
View File
doc/sql/transport/lqj/20261028/02_blade_kingdee_fail_reason_20261028.sql → doc/sql/transport/lqj/20261102/02_blade_kingdee_fail_reason_20261028.sql
View File
doc/sql/transport/lqj/temp/03_blade_customer_risk_dict_20261030.sql → doc/sql/transport/lqj/20261102/03_blade_customer_risk_dict_20261030.sql
View File
doc/sql/transport/lqj/temp/04_blade_contract_black_status_rename_20261030.sql → doc/sql/transport/lqj/20261102/04_blade_contract_black_status_rename_20261030.sql
View File
doc/sql/transport/lqj/temp/05_blade_contract_risk_fields_drop_20261030.sql → doc/sql/transport/lqj/20261102/05_blade_contract_risk_fields_drop_20261030.sql
View File
doc/sql/transport/lqj/20261102/06_blade_formal_settlement_kingdee_writeoff_20261030.sql
+68
View File
@@ -0,0 +1,68 @@
-- 正式结算单：新增金蝶冲销状态字段
-- 列名遵循 MyBatis-Plus 驼峰转下划线默认映射（kingdeeWriteOffStatus -> kingdee_write_off_status，kingdeeWriteOffTime -> kingdee_write_off_time）；
-- 若存在早期脚本误建的旧列名 kingdee_writeoff_status / kingdee_writeoff_time 则先重命名，否则按缺失新增
-- 结算单列表展示金蝶侧旧应付/应收单冲销状态：定时任务按 A102-4/A302-4 hadwrittenoff 批量回写，
-- 选单预检/重推闸门实时查询后顺带回写；默认 unwrittenoff-未冲销（金蝶单据在未冲销前即视为未冲销，避免首跑全量初始化回写），writtenoff-已冲销（部分冲销视同已冲销）
-- ==================== kingdee_write_off_status ====================
-- 旧列名重命名（早期脚本版本，不存在则跳过）
SET @old_col := (
SELECT COUNT(*) FROM information_schema.COLUMNS
WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'blade_formal_settlement'
AND COLUMN_NAME = 'kingdee_writeoff_status'
);
SET @ddl_sql = IF(@old_col = 1,
'ALTER TABLE `blade_formal_settlement` CHANGE COLUMN `kingdee_writeoff_status` `kingdee_write_off_status` varchar(20) COLLATE utf8mb4_general_ci DEFAULT ''unwrittenoff'' COMMENT ''金蝶冲销状态：unwrittenoff-未冲销（默认） writtenoff-已冲销''',
'SELECT 1');
PREPARE ddl_stmt FROM @ddl_sql;
EXECUTE ddl_stmt;
DEALLOCATE PREPARE ddl_stmt;
-- 缺失则新增（支持重复执行）
SET @ddl_sql = (
SELECT IF(COUNT(*) = 0,
'ALTER TABLE `blade_formal_settlement` ADD COLUMN `kingdee_write_off_status` varchar(20) COLLATE utf8mb4_general_ci DEFAULT ''unwrittenoff'' COMMENT ''金蝶冲销状态：unwrittenoff-未冲销（默认） writtenoff-已冲销'' AFTER `kingdee_fail_reason`',
'SELECT 1')
FROM information_schema.COLUMNS
WHERE TABLE_SCHEMA = DATABASE()
AND TABLE_NAME = 'blade_formal_settlement'
AND COLUMN_NAME = 'kingdee_write_off_status'
);
PREPARE ddl_stmt FROM @ddl_sql;
EXECUTE ddl_stmt;
DEALLOCATE PREPARE ddl_stmt;
-- 存量已同步结算单回填默认未冲销（可重复执行：仅补 NULL 行；未同步单据保持默认值即可，前端按同步状态展示'-'）
UPDATE `blade_formal_settlement`
SET `kingdee_write_off_status` = 'unwrittenoff'
WHERE `kingdee_write_off_status` IS NULL
AND `kingdee_sync_status` = 'synced'
AND `is_deleted` = 0;
-- ==================== kingdee_write_off_time ====================
-- 旧列名重命名（早期脚本版本，不存在则跳过）
SET @old_col := (
SELECT COUNT(*) FROM information_schema.COLUMNS
WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'blade_formal_settlement'
AND COLUMN_NAME = 'kingdee_writeoff_time'
);
SET @ddl_sql = IF(@old_col = 1,
'ALTER TABLE `blade_formal_settlement` CHANGE COLUMN `kingdee_writeoff_time` `kingdee_write_off_time` datetime DEFAULT NULL COMMENT ''金蝶冲销状态确认时间（定时回写/预检回写时间）''',
'SELECT 1');
PREPARE ddl_stmt FROM @ddl_sql;
EXECUTE ddl_stmt;
DEALLOCATE PREPARE ddl_stmt;
-- 缺失则新增（支持重复执行）
SET @ddl_sql = (
SELECT IF(COUNT(*) = 0,
'ALTER TABLE `blade_formal_settlement` ADD COLUMN `kingdee_write_off_time` datetime DEFAULT NULL COMMENT ''金蝶冲销状态确认时间（定时回写/预检回写时间）'' AFTER `kingdee_write_off_status`',
'SELECT 1')
FROM information_schema.COLUMNS
WHERE TABLE_SCHEMA = DATABASE()
AND TABLE_NAME = 'blade_formal_settlement'
AND COLUMN_NAME = 'kingdee_write_off_time'
);
PREPARE ddl_stmt FROM @ddl_sql;
EXECUTE ddl_stmt;
DEALLOCATE PREPARE ddl_stmt;
doc/sql/transport/lqj/temp/blade_customer_archive_add_supplier_code_20261030.sql → doc/sql/transport/lqj/20261102/blade_customer_archive_add_supplier_code_20261030.sql
View File
doc/sql/transport/lqj/temp/06_blade_invoice_receipt_supplier_code_menu_20261031.sql
-44
View File
@@ -1,44 +0,0 @@
-- 先票后款改造（收票登记A303-2 + 付款结算单A102-2 + A302-6指定应付）
-- ① blade_invoice_receipt 新增 supplier_code：往来户=发票销售方在金蝶的供应商代码（A901-1），保存时尽力回填、推送前强校验
-- ② 付款结算单（payment_settlement）下新增「发票登记」按钮权限：结算单审批后发票登记关联收票单并推送指定应付
-- 幂等可重复执行：列查 information_schema，菜单 NOT EXISTS 防重
-- ① 收票登记表新增 supplier_code 列
SET @ddl = (
SELECT IF(
(SELECT COUNT(*) FROM information_schema.COLUMNS
WHERE TABLE_SCHEMA = DATABASE()
AND TABLE_NAME = 'blade_invoice_receipt'
AND COLUMN_NAME = 'supplier_code') = 0,
'ALTER TABLE `blade_invoice_receipt` ADD COLUMN `supplier_code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT ''往来户金蝶供应商代码（发票销售方，A901-1，保存时尽力回填、推送前强校验）'' AFTER `payee_name`',
'SELECT 1'));
PREPARE stmt FROM @ddl;
EXECUTE stmt;
DEALLOCATE PREPARE stmt;
-- ② 付款结算单「发票登记」按钮权限（先票后款路径B：列表发票登记 → 关联收票单 → 推送 A302-6 指定应付）
INSERT INTO `blade_menu`
(`id`,`parent_id`,`code`,`name`,`alias`,`path`,`source`,`sort`,`category`,`action`,`is_open`,`component`,`remark`,`is_deleted`)
SELECT
2090000000000002300,
p.id,
'payment_settlement_invoice_register',
'发票登记',
'payment_settlement_invoice_register',
'',
'',
2,
2,
0,
1,
NULL,
'先票后款：结算单审批后发票登记关联收票单并推送金蝶指定应付',
0
FROM `blade_menu` p
WHERE p.`code` = 'payment_settlement'
AND p.`is_deleted` = 0
AND NOT EXISTS (
SELECT 1 FROM `blade_menu` x
WHERE x.`code` = 'payment_settlement_invoice_register' AND x.`is_deleted` = 0
)
LIMIT 1;
doc/sql/transport/lqj/temp/19_blade_dict_fee_category_warehouse_20261103.sql
-20
View File
@@ -1,20 +0,0 @@
-- 金蝶分录仓储大类（A102-2/A302-2/A103-1 分录拆分按费用项档案分类编码判定仓储大类，无名称关键字兜底）。
-- ① 业务字典 fee_category 新增子项 A05 仓储；② 费用项档案仓储类费用项归入 A05（分类生效前提）。
-- id 由 UUID_SHORT() 动态生成，幂等可重复执行。
-- ① 业务字典 fee_category 新增子项：A05 仓储
INSERT INTO blade_dict_biz (id, tenant_id, parent_id, code, dict_key, dict_value, sort, remark, is_sealed, status, is_deleted)
SELECT UUID_SHORT(), '000000',
(SELECT id FROM blade_dict_biz WHERE code = 'fee_category' AND dict_key = '-1' AND tenant_id = '000000' AND is_deleted = 0 LIMIT 1),
'fee_category', 'A05', '仓储', 1, '金蝶分录仓储大类', 0, 1, 0
WHERE NOT EXISTS (
SELECT 1 FROM blade_dict_biz
WHERE code = 'fee_category' AND dict_key = 'A05' AND tenant_id = '000000' AND is_deleted = 0
);
# -- ② 费用项档案：仓储类费用项归入 A05（已执行则更新 0 行，幂等）
# UPDATE blade_fee_item
# SET fee_category = 'A05'
# WHERE is_deleted = 0
# AND fee_category <> 'A05'
# AND (name LIKE '%仓储%' OR name LIKE '%堆存%' OR name LIKE '%保管%');
doc/sql/transport/transport.sql
+10 -1
View File
@@ -836,6 +836,7 @@ INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `s
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (1123598815738675230, 1123598815738675205, 'dept_edit', '修改', 'edit', '/system/dept/edit', 'form', 2, 2, 2, 1, '', NULL, 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (1123598815738675231, 1123598815738675205, 'dept_delete', '删除', 'delete', '/api/blade-system/dept/remove', 'delete', 3, 2, 3, 1, '', NULL, 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (1123598815738675232, 1123598815738675205, 'dept_view', '查看', 'view', '/system/dept/view', 'file-text', 4, 2, 2, 1, '', NULL, 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2076110415738675232, 1123598815738675205, 'dept_tree', '树形结构', 'dept_tree', '/api/blade-system/dept/tree', 'file-text', 5, 2, 2, 1, '', '组织树接口独立数据权限配置项；未配置时组织树默认不展示', 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (1123598815738675233, 1123598815738675206, 'dict_add', '新增', 'add', '/system/dict/add', 'plus', 1, 2, 1, 1, '', NULL, 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (1123598815738675234, 1123598815738675206, 'dict_edit', '修改', 'edit', '/system/dict/edit', 'form', 2, 2, 2, 1, '', NULL, 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (1123598815738675235, 1123598815738675206, 'dict_delete', '删除', 'delete', '/api/blade-system/dict/remove', 'delete', 3, 2, 3, 1, '', NULL, 0);
@@ -998,7 +999,9 @@ INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `s
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075429169922023425, 2075427962415456258, 'railway_station_edit', '编辑', 'railway_station_edit', '', '', 1, 2, 0, 1, NULL, '', 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075429216734650369, 2075427962415456258, 'railway_station_status', '修改状态', 'railway_station_status', '', '', 1, 2, 0, 1, NULL, '', 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075429274242752513, 2075427962415456258, 'railway_station_add', '新增', 'railway_station_add', '', '', 1, 2, 0, 1, NULL, '', 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075429280000000001, 2075427962415456258, 'railway_station_view', '查看', 'railway_station_view', '', '', 1, 2, 0, 1, NULL, '', 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075429329544650754, 2075421555200860162, 'port_terminal_add', '新增', 'port_terminal_add', '', '', 1, 2, 0, 1, NULL, '', 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075429330000000001, 2075421555200860162, 'port_terminal_view', '查看', 'port_terminal_view', '', '', 1, 2, 0, 1, NULL, '', 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075431169720033282, 1164733399668962201, 'airport_master', '空港机场主数据', 'airport_master', '/base/airport-master', 'iconfont icon-fengche', 30, 1, 0, 1, NULL, '', 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075431461312241665, 2075431169720033282, 'airport_master_import', '批量导入', 'airport_master_import', '', '', 1, 2, 0, 1, NULL, '', 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075431522544885762, 2075431169720033282, 'airport_master_template', '下载模板', 'airport_master_template', '', '', 1, 2, 0, 1, NULL, '', 0);
@@ -1007,6 +1010,7 @@ INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `s
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075431710063828994, 2075431169720033282, 'airport_master_edit', '编辑', 'airport_master_edit', '', '', 1, 2, 0, 1, NULL, '', 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075431753298714626, 2075431169720033282, 'airport_master_status', '修改状态', 'airport_master_status', '', '', 1, 2, 0, 1, NULL, '', 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075431820189474818, 2075431169720033282, 'airport_master_add', '新增', 'airport_master_add', '', '', 1, 2, 0, 1, NULL, '', 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075431850000000001, 2075431169720033282, 'airport_master_view', '查看', 'airport_master_view', '', '', 1, 2, 0, 1, NULL, '', 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449000000000001, 1164733399668962201, 'currency', '币种汇率管理', 'currency', '/base/currency', 'iconfont iconicon_exchange', 40, 1, 0, 1, NULL, '', 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449000000000002, 2075449000000000001, 'currency_import', '批量导入', 'currency_import', '', '', 1, 2, 0, 1, NULL, '', 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449000000000003, 2075449000000000001, 'currency_template', '下载模板', 'currency_template', '', '', 1, 2, 0, 1, NULL, '', 0);
@@ -1015,11 +1019,13 @@ INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `s
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449000000000006, 2075449000000000001, 'currency_edit', '编辑', 'currency_edit', '', '', 1, 2, 0, 1, NULL, '', 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449000000000007, 2075449000000000001, 'currency_status', '修改状态', 'currency_status', '', '', 1, 2, 0, 1, NULL, '', 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449000000000008, 2075449000000000001, 'currency_add', '新增', 'currency_add', '', '', 1, 2, 0, 1, NULL, '', 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449000000000009, 2075449000000000001, 'currency_view', '查看', 'currency_view', '', '', 1, 2, 0, 1, NULL, '', 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449100000000001, 1164733399668962201, 'customer_type', '客商类型', 'customer_type', '/base/customer-type', 'iconfont icon-hezuohuobanmiyueguanli', 50, 1, 0, 1, NULL, '', 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449100000000002, 2075449100000000001, 'customer_type_delete', '批量删除', 'customer_type_delete', '', '', 1, 2, 0, 1, NULL, '', 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449100000000003, 2075449100000000001, 'customer_type_edit', '编辑', 'customer_type_edit', '', '', 1, 2, 0, 1, NULL, '', 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449100000000004, 2075449100000000001, 'customer_type_status', '修改状态', 'customer_type_status', '', '', 1, 2, 0, 1, NULL, '', 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449100000000005, 2075449100000000001, 'customer_type_add', '新增', 'customer_type_add', '', '', 1, 2, 0, 1, NULL, '', 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449100000000006, 2075449100000000001, 'customer_type_view', '查看', 'customer_type_view', '', '', 1, 2, 0, 1, NULL, '', 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449200000000001, 1164733399668962201, 'fee_item', '费用项', 'fee_item', '/base/fee-item', 'iconfont icon-shoucang', 60, 1, 0, 1, NULL, '', 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449200000000002, 2075449200000000001, 'fee_item_delete', '批量删除', 'fee_item_delete', '', '', 1, 2, 0, 1, NULL, '', 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449200000000003, 2075449200000000001, 'fee_item_edit', '编辑', 'fee_item_edit', '', '', 1, 2, 0, 1, NULL, '', 0);
@@ -1028,6 +1034,7 @@ INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `s
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449200000000006, 2075449200000000001, 'fee_item_import', '批量导入', 'fee_item_import', '/api/blade-system/fee-item/import-fee-item', 'upload', 5, 2, 3, 1, NULL, '', 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449200000000007, 2075449200000000001, 'fee_item_template', '下载模板', 'fee_item_template', '/api/blade-system/fee-item/export-template', 'download', 6, 2, 2, 1, NULL, '', 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449200000000008, 2075449200000000001, 'fee_item_export', '批量导出', 'fee_item_export', '/api/blade-system/fee-item/export-fee-item', 'download', 7, 2, 2, 1, NULL, '', 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449200000000009, 2075449200000000001, 'fee_item_view', '查看', 'fee_item_view', '', '', 1, 2, 0, 1, NULL, '', 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075436235826896898, 0, 'blade-transport', '车/船务管理', 'blade-transport', '/vehicle', 'iconfont icon-shebeiguanli', 10, 1, 0, 1, '', '', 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075437082342301697, 2075436235826896898, 'maintenance_record', '维修记录', 'maintenance_record', '/vehicle/maintenance-record', 'iconfont icon-wxbgongju', 20, 1, 0, 1, '', '', 0);
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075437237678350338, 2075436235826896898, 'maintenance_plan', '保养记录', 'maintenance_plan', '/vehicle/maintenance-plan', 'iconfont iconicon_exchange', 30, 1, 0, 1, '', '', 0);
@@ -5620,6 +5627,7 @@ CREATE TABLE `blade_vehicle_maintenance_record` (
`tenant_id` varchar(12) DEFAULT '000000' COMMENT '租户ID',
`vehicle_type` varchar(20) NOT NULL COMMENT '车船类型',
`vehicle_no` varchar(30) NOT NULL COMMENT '车牌号/船号',
`exception_id` bigint(20) DEFAULT NULL COMMENT '关联异常处置ID（小程序录入时写入）',
`maintainer` varchar(20) DEFAULT NULL COMMENT '维修人',
`maintenance_time` datetime NOT NULL COMMENT '维修时间',
`location` varchar(100) DEFAULT NULL COMMENT '维修位置',
@@ -5642,7 +5650,8 @@ CREATE TABLE `blade_vehicle_maintenance_record` (
`is_deleted` int(11) DEFAULT '0' COMMENT '是否已删除',
PRIMARY KEY (`id`) USING BTREE,
KEY `idx_vehicle_maintenance_record_no` (`vehicle_no`) USING BTREE,
KEY `idx_vehicle_maintenance_record_time` (`maintenance_time`) USING BTREE
KEY `idx_vehicle_maintenance_record_time` (`maintenance_time`) USING BTREE,
UNIQUE KEY `uk_vehicle_maintenance_record_exception` (`exception_id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='车辆维修记录';
-- ----------------------------