提交
This commit is contained in:
zlwu committed
1 parent
0b50eff3d8
commit
ee364e24aa
323 files changed
+57731
-35766
No files matched your search
@@ -0,0 +1,3 @@
|
||||
-- 环境检测登记：新增结果时间
|
||||
ALTER TABLE `biz_env_detect_record`
|
||||
ADD COLUMN `result_time` datetime DEFAULT NULL COMMENT '结果时间' AFTER `detect_time`;
|
||||
@@ -0,0 +1,3 @@
|
||||
-- 生产物料入库批次：增加生产日期
|
||||
ALTER TABLE `biz_production_material_stock_batch`
|
||||
ADD COLUMN `production_date` date DEFAULT NULL COMMENT '生产日期' AFTER `expire_date`;
|
||||
@@ -0,0 +1,4 @@
|
||||
-- 检测项目参数模板：单选类型支持选项列表与默认值
|
||||
ALTER TABLE `biz_qc_item_param`
|
||||
ADD COLUMN `options` varchar(2000) DEFAULT NULL COMMENT '单选选项列表，JSON数组格式' AFTER `param_type`,
|
||||
ADD COLUMN `default_value` varchar(500) DEFAULT NULL COMMENT '单选默认值' AFTER `options`;
|
||||
@@ -0,0 +1,46 @@
|
||||
-- 质检管理 · 质检物料库：新增「查看单价金额」按钮权限（F 类型，仅角色权限树勾选）
|
||||
INSERT INTO `sys_menu` (
|
||||
`id`,
|
||||
`menu_name`,
|
||||
`parent_id`,
|
||||
`menu_type`,
|
||||
`path`,
|
||||
`component`,
|
||||
`perms`,
|
||||
`is_frame`,
|
||||
`visible`,
|
||||
`status`,
|
||||
`tenant_no`,
|
||||
`order_num`,
|
||||
`remark`,
|
||||
`create_by`,
|
||||
`create_dept_id`,
|
||||
`create_time`,
|
||||
`update_by`,
|
||||
`update_time`,
|
||||
`del_flag`
|
||||
)
|
||||
SELECT
|
||||
'70000000000000000000000000000090',
|
||||
'查看单价金额',
|
||||
'70000000000000000000000000000009',
|
||||
'F',
|
||||
'',
|
||||
'',
|
||||
'biz:qcMaterial:viewAmount',
|
||||
1,
|
||||
'0',
|
||||
'1',
|
||||
'zkxw',
|
||||
1,
|
||||
'控制质检物料库各 Tab 列表、查看弹窗与导出中的单价、金额字段展示',
|
||||
NULL,
|
||||
'',
|
||||
NOW(),
|
||||
NULL,
|
||||
NOW(),
|
||||
0
|
||||
FROM DUAL
|
||||
WHERE NOT EXISTS (
|
||||
SELECT 1 FROM `sys_menu` WHERE `id` = '70000000000000000000000000000090'
|
||||
);
|
||||
@@ -0,0 +1,83 @@
|
||||
-- 历史质检工单：为每工单创建默认检测批次 B01，并回填 batch_id
|
||||
|
||||
-- 注意：按租户/环境执行前请备份；若已存在批次可跳过对应工单
|
||||
|
||||
INSERT INTO `biz_qc_work_order_inspection_batch` (
|
||||
`id`, `work_order_id`, `order_source`, `batch_no`, `batch_name`,
|
||||
`tenant_no`, `order_num`, `remark`, `create_by`, `create_dept_id`,
|
||||
`create_time`, `update_by`, `update_time`, `del_flag`
|
||||
)
|
||||
SELECT
|
||||
UUID() AS id,
|
||||
wo.id AS work_order_id,
|
||||
CASE wo.work_order_type
|
||||
WHEN 'temporary' THEN 'temporary'
|
||||
WHEN 'outbound' THEN 'outbound'
|
||||
ELSE 'inbound'
|
||||
END AS order_source,
|
||||
CONCAT(wo.work_order_no, '-B01') AS batch_no,
|
||||
CONCAT(DATE_FORMAT(COALESCE(wo.create_time, NOW()), '%Y%m%d'), '检测') AS batch_name,
|
||||
wo.tenant_no,
|
||||
1 AS order_num,
|
||||
'历史数据迁移默认批次' AS remark,
|
||||
wo.create_by,
|
||||
COALESCE(wo.create_dept_id, '') AS create_dept_id,
|
||||
NOW() AS create_time,
|
||||
wo.update_by,
|
||||
NOW() AS update_time,
|
||||
0 AS del_flag
|
||||
FROM `biz_qc_work_order` wo
|
||||
WHERE wo.del_flag = 0
|
||||
AND wo.work_order_status IN ('ypz', 'ywc')
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM `biz_qc_work_order_inspection_batch` b
|
||||
WHERE b.work_order_id = wo.id AND b.del_flag = 0
|
||||
);
|
||||
|
||||
-- 回填实验室明细 batch_id
|
||||
UPDATE `biz_qc_work_order_lab_item` li
|
||||
INNER JOIN `biz_qc_work_order_inspection_batch` b
|
||||
ON b.work_order_id = li.work_order_id AND b.del_flag = 0 AND b.batch_no LIKE '%-B01'
|
||||
SET li.batch_id = b.id
|
||||
WHERE li.del_flag = 0 AND (li.batch_id IS NULL OR li.batch_id = '');
|
||||
|
||||
-- 回填第三方明细 batch_id
|
||||
UPDATE `biz_qc_work_order_third_item` ti
|
||||
INNER JOIN `biz_qc_work_order_inspection_batch` b
|
||||
ON b.work_order_id = ti.work_order_id AND b.del_flag = 0 AND b.batch_no LIKE '%-B01'
|
||||
SET ti.batch_id = b.id
|
||||
WHERE ti.del_flag = 0 AND (ti.batch_id IS NULL OR ti.batch_id = '');
|
||||
|
||||
-- 回填任务 batch_id
|
||||
UPDATE `biz_qc_task` t
|
||||
INNER JOIN `biz_qc_work_order_inspection_batch` b
|
||||
ON b.work_order_id = t.work_order_id AND b.del_flag = 0 AND b.batch_no LIKE '%-B01'
|
||||
SET t.batch_id = b.id
|
||||
WHERE t.del_flag = 0 AND (t.batch_id IS NULL OR t.batch_id = '');
|
||||
|
||||
-- 从任务负责人迁移批次负责人（去重）
|
||||
INSERT INTO `biz_qc_batch_assignee` (
|
||||
`id`, `batch_id`, `user_id`, `tenant_no`, `order_num`,
|
||||
`create_by`, `create_dept_id`, `create_time`, `update_by`, `update_time`, `del_flag`
|
||||
)
|
||||
SELECT
|
||||
UUID(),
|
||||
b.id,
|
||||
ta.user_id,
|
||||
b.tenant_no,
|
||||
0,
|
||||
b.create_by,
|
||||
b.create_dept_id,
|
||||
NOW(),
|
||||
b.update_by,
|
||||
NOW(),
|
||||
0
|
||||
FROM `biz_qc_work_order_inspection_batch` b
|
||||
INNER JOIN `biz_qc_task` t ON t.batch_id = b.id AND t.del_flag = 0
|
||||
INNER JOIN `biz_qc_task_assignee` ta ON ta.task_id = t.id AND ta.del_flag = 0
|
||||
WHERE b.del_flag = 0
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM `biz_qc_batch_assignee` ba
|
||||
WHERE ba.batch_id = b.id AND ba.user_id = ta.user_id AND ba.del_flag = 0
|
||||
)
|
||||
GROUP BY b.id, ta.user_id, b.tenant_no, b.create_by, b.create_dept_id, b.update_by;
|
||||
@@ -0,0 +1,54 @@
|
||||
-- 质检检测批次：新表 + 明细 batch_id + 历史数据迁移
|
||||
|
||||
-- 1. 检测批次主表
|
||||
CREATE TABLE IF NOT EXISTS `biz_qc_work_order_inspection_batch` (
|
||||
`id` varchar(64) NOT NULL COMMENT '主键ID',
|
||||
`work_order_id` varchar(64) NOT NULL COMMENT '工单ID',
|
||||
`order_source` varchar(20) NOT NULL DEFAULT 'inbound' COMMENT '工单来源',
|
||||
`batch_no` varchar(32) NOT NULL COMMENT '批次编号',
|
||||
`batch_name` varchar(200) NOT NULL COMMENT '批次展示名',
|
||||
`tenant_no` varchar(64) NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
|
||||
`order_num` int(11) DEFAULT NULL COMMENT '排序号',
|
||||
`remark` varchar(512) DEFAULT NULL COMMENT '备注',
|
||||
`create_by` varchar(64) DEFAULT NULL COMMENT '创建人id',
|
||||
`create_dept_id` varchar(64) NOT NULL DEFAULT '' COMMENT '创建人部门ID',
|
||||
`create_time` datetime NOT NULL COMMENT '创建时间',
|
||||
`update_by` varchar(64) DEFAULT NULL COMMENT '更新人id',
|
||||
`update_time` datetime NOT NULL COMMENT '更新时间',
|
||||
`del_flag` tinyint(4) NOT NULL DEFAULT '0' COMMENT '删除标记',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `idx_qc_wo_batch_wo` (`work_order_id`,`del_flag`),
|
||||
KEY `idx_qc_wo_batch_no` (`tenant_no`,`batch_no`,`del_flag`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='质检工单检测批次';
|
||||
|
||||
-- 2. 批次负责人
|
||||
CREATE TABLE IF NOT EXISTS `biz_qc_batch_assignee` (
|
||||
`id` varchar(64) NOT NULL COMMENT '主键',
|
||||
`batch_id` varchar(64) NOT NULL COMMENT '检测批次ID',
|
||||
`user_id` varchar(64) NOT NULL COMMENT '负责人用户ID',
|
||||
`tenant_no` varchar(64) NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
|
||||
`order_num` int(11) DEFAULT '0' COMMENT '展示顺序',
|
||||
`remark` varchar(512) DEFAULT NULL COMMENT '备注',
|
||||
`create_by` varchar(64) DEFAULT NULL COMMENT '创建人id',
|
||||
`create_dept_id` varchar(64) DEFAULT NULL COMMENT '创建人部门ID',
|
||||
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
|
||||
`update_by` varchar(64) DEFAULT NULL COMMENT '更新人id',
|
||||
`update_time` datetime DEFAULT NULL COMMENT '更新时间',
|
||||
`del_flag` tinyint(4) NOT NULL DEFAULT '0' COMMENT '删除标记',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `idx_qc_batch_assignee_batch` (`batch_id`,`del_flag`),
|
||||
KEY `idx_qc_batch_assignee_user` (`user_id`,`tenant_no`,`del_flag`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='质检检测批次负责人';
|
||||
|
||||
-- 3. 明细表增加 batch_id
|
||||
ALTER TABLE `biz_qc_work_order_lab_item`
|
||||
ADD COLUMN `batch_id` varchar(64) DEFAULT NULL COMMENT '检测批次ID' AFTER `order_source`;
|
||||
|
||||
ALTER TABLE `biz_qc_work_order_third_item`
|
||||
ADD COLUMN `batch_id` varchar(64) DEFAULT NULL COMMENT '检测批次ID' AFTER `order_source`;
|
||||
|
||||
ALTER TABLE `biz_qc_task`
|
||||
ADD COLUMN `batch_id` varchar(64) DEFAULT NULL COMMENT '检测批次ID' AFTER `work_order_id`;
|
||||
|
||||
-- 4. 历史数据迁移：每工单默认批次 B01（需在应用层或下列 SQL 按环境执行）
|
||||
-- 见 migrate_qc_inspection_batch_data.sql
|
||||
@@ -1413,6 +1413,7 @@ CREATE TABLE `biz_env_detect_record` (
|
||||
`id` varchar(64) NOT NULL COMMENT '主键ID',
|
||||
`record_no` varchar(32) NOT NULL COMMENT '登记编号',
|
||||
`detect_time` datetime NOT NULL COMMENT '检测时间',
|
||||
`result_time` datetime DEFAULT NULL COMMENT '结果时间',
|
||||
`inspector_ids` varchar(500) NOT NULL COMMENT '检测人用户ID，逗号分隔',
|
||||
`inspector_names` varchar(500) NOT NULL COMMENT '检测人姓名快照，逗号分隔',
|
||||
`env_detect_item_id` varchar(64) NOT NULL COMMENT '检测项目ID',
|
||||
@@ -3177,6 +3178,7 @@ CREATE TABLE `biz_production_material_stock_batch` (
|
||||
`stock_in_no` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '入库编号（租户内唯一）',
|
||||
`stock_in_date` date NOT NULL COMMENT '入库日期',
|
||||
`expire_date` date NOT NULL COMMENT '过期日期',
|
||||
`production_date` date DEFAULT NULL COMMENT '生产日期',
|
||||
`catalog_no` varchar(128) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '货号',
|
||||
`batch_no` varchar(128) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '批号',
|
||||
`manufacturer` varchar(200) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '厂家',
|
||||
@@ -4168,6 +4170,8 @@ CREATE TABLE `biz_qc_item_param` (
|
||||
`param_code` varchar(64) NOT NULL COMMENT '参数编码',
|
||||
`param_unit` varchar(32) DEFAULT NULL COMMENT '单位',
|
||||
`param_type` varchar(16) NOT NULL DEFAULT 'text' COMMENT 'number/text/select',
|
||||
`options` varchar(2000) DEFAULT NULL COMMENT '单选选项列表，JSON数组格式',
|
||||
`default_value` varchar(500) DEFAULT NULL COMMENT '单选默认值',
|
||||
`required_flag` char(1) NOT NULL DEFAULT '0' COMMENT '1必填 0非必填',
|
||||
`tenant_no` varchar(64) NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
|
||||
`order_num` int(11) DEFAULT NULL COMMENT '排序号',
|
||||
|
||||
Reference in new issue
Block a user