chenx/qhmes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

密炼生产计划维护表更改

Browse Source
This commit is contained in:
chenx
2026-06-17 16:39:39 +08:00
parent 2ec2b6a628
commit 816af5df6e
9 changed files with 384 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_134__mes_xsl_mixing_production_plan_shared_shift_fields.sql Normal file
View File

@@ -0,0 +1,18 @@
-- 密炼生产计划维护：早中晚共用字段 + 班次标识
SET NAMES utf8mb4;
ALTER TABLE `mes_xsl_mixing_production_plan`
ADD COLUMN IF NOT EXISTS `shift_flag` int DEFAULT NULL COMMENT '班次标识：1早班 2中班 3晚班' AFTER `machine_name`,
ADD COLUMN IF NOT EXISTS `plan_id` varchar(32) DEFAULT NULL COMMENT '计划ID（母胶/终胶计划）' AFTER `plan_date`,
ADD COLUMN IF NOT EXISTS `plan_type` varchar(2) DEFAULT NULL COMMENT '计划类型：M母胶/F终胶' AFTER `plan_id`,
ADD COLUMN IF NOT EXISTS `source_order_id` varchar(32) DEFAULT NULL COMMENT '生产订单ID' AFTER `plan_type`,
ADD COLUMN IF NOT EXISTS `order_no` varchar(64) DEFAULT NULL COMMENT '生产订单号' AFTER `source_order_id`,
ADD COLUMN IF NOT EXISTS `order_date` date DEFAULT NULL COMMENT '订单日期' AFTER `order_no`,
ADD COLUMN IF NOT EXISTS `formula_name` varchar(128) DEFAULT NULL COMMENT '配方名称' AFTER `order_date`,
ADD COLUMN IF NOT EXISTS `plan_weight` decimal(18,6) DEFAULT NULL COMMENT '计划重量' AFTER `formula_name`,
ADD COLUMN IF NOT EXISTS `planned_car_count` int DEFAULT NULL COMMENT '计划车数' AFTER `plan_weight`,
ADD COLUMN IF NOT EXISTS `scheduled_car_count` int DEFAULT NULL COMMENT '已排产车数' AFTER `planned_car_count`,
ADD COLUMN IF NOT EXISTS `finished_car_count` int DEFAULT NULL COMMENT '完成车数' AFTER `scheduled_car_count`,
ADD COLUMN IF NOT EXISTS `plan_count` int DEFAULT NULL COMMENT '计划' AFTER `finished_car_count`,
ADD COLUMN IF NOT EXISTS `remark` varchar(500) DEFAULT NULL COMMENT '备注' AFTER `plan_count`;

31
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_135__mes_xsl_mixing_production_plan_drop_redundant_shift_columns.sql Normal file
View File

@@ -0,0 +1,31 @@
-- 密炼生产计划维护：删除早/中/晚冗余字段，保留共用字段 + 班次标识
SET NAMES utf8mb4;
SET @drop_sql = (
SELECT IFNULL(
CONCAT(
'ALTER TABLE `mes_xsl_mixing_production_plan` ',
GROUP_CONCAT(CONCAT('DROP COLUMN `', column_name, '`') ORDER BY ordinal_position SEPARATOR ', ')
),
'SELECT 1'
)
FROM information_schema.COLUMNS
WHERE TABLE_SCHEMA = DATABASE()
AND TABLE_NAME = 'mes_xsl_mixing_production_plan'
AND COLUMN_NAME IN (
'morning_plan_id', 'morning_plan_type', 'morning_source_order_id', 'morning_order_no', 'morning_order_date',
'morning_formula_name', 'morning_plan_weight', 'morning_planned_car_count', 'morning_scheduled_car_count',
'morning_finished_car_count', 'morning_plan_count', 'morning_remark',
'noon_plan_id', 'noon_plan_type', 'noon_source_order_id', 'noon_order_no', 'noon_order_date',
'noon_formula_name', 'noon_plan_weight', 'noon_planned_car_count', 'noon_scheduled_car_count',
'noon_finished_car_count', 'noon_plan_count', 'noon_remark',
'night_plan_id', 'night_plan_type', 'night_source_order_id', 'night_order_no', 'night_order_date',
'night_formula_name', 'night_plan_weight', 'night_planned_car_count', 'night_scheduled_car_count',
'night_finished_car_count', 'night_plan_count', 'night_remark'
)
);
PREPARE stmt FROM @drop_sql;
EXECUTE stmt;
DEALLOCATE PREPARE stmt;

44
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_136__mes_xsl_mixing_production_plan_recreate.sql Normal file
View File

@@ -0,0 +1,44 @@
-- 密炼生产计划维护：删表重建（注意：会清空原表数据）
SET NAMES utf8mb4;
DROP TABLE IF EXISTS `mes_xsl_mixing_production_plan`;
CREATE TABLE `mes_xsl_mixing_production_plan` (
`id` varchar(32) NOT NULL COMMENT '主键',
`sort_no` int DEFAULT NULL COMMENT '排序号',
`machine_id` varchar(32) DEFAULT NULL COMMENT '机台ID（mes_xsl_equipment_ledger.id）',
`machine_name` varchar(128) DEFAULT NULL COMMENT '机台名称冗余',
`shift_flag` int DEFAULT NULL COMMENT '班次标识：1早班 2中班 3晚班',
`plan_date` date DEFAULT NULL COMMENT '计划日期（保存时写入当前日期）',
`plan_no` varchar(32) DEFAULT NULL COMMENT '计划号（yyyyMMddA三位流水）',
`plan_id` varchar(32) DEFAULT NULL COMMENT '计划ID（母胶/终胶计划）',
`plan_type` varchar(2) DEFAULT NULL COMMENT '计划类型：M母胶/F终胶',
`source_order_id` varchar(32) DEFAULT NULL COMMENT '生产订单ID',
`material_id` varchar(32) DEFAULT NULL COMMENT '胶料ID（mes_material.id）',
`material_name` varchar(128) DEFAULT NULL COMMENT '胶料名称（取母胶/终胶计划mesMaterialName）',
`order_no` varchar(64) DEFAULT NULL COMMENT '生产订单号',
`order_date` date DEFAULT NULL COMMENT '订单日期',
`formula_name` varchar(128) DEFAULT NULL COMMENT '配方名称',
`plan_weight` decimal(18,6) DEFAULT NULL COMMENT '计划重量',
`planned_car_count` int DEFAULT NULL COMMENT '计划车数',
`scheduled_car_count` int DEFAULT NULL COMMENT '已排产车数',
`finished_car_count` int DEFAULT NULL COMMENT '完成车数',
`plan_count` int DEFAULT NULL COMMENT '计划',
`remark` varchar(500) DEFAULT NULL COMMENT '备注',
`tenant_id` int DEFAULT NULL COMMENT '租户',
`sys_org_code` varchar(64) DEFAULT NULL COMMENT '部门编码',
`create_by` varchar(32) DEFAULT NULL COMMENT '创建人',
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
`update_by` varchar(32) DEFAULT NULL COMMENT '更新人',
`update_time` datetime DEFAULT NULL COMMENT '更新时间',
`del_flag` int DEFAULT '0' COMMENT '删除标记（0正常1删除）',
PRIMARY KEY (`id`),
KEY `idx_mxmp_machine` (`machine_id`),
KEY `idx_mxmp_plan_date` (`plan_date`),
KEY `idx_mxmp_plan_no` (`plan_no`),
KEY `idx_mxmp_shift_flag` (`shift_flag`),
KEY `idx_mxmp_plan_id` (`plan_id`),
KEY `idx_mxmp_sort` (`sort_no`),
KEY `idx_mxmp_tenant` (`tenant_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES密炼生产计划维护';

7
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_137__mes_xsl_mixing_production_plan_add_material_fields.sql Normal file
View File

@@ -0,0 +1,7 @@
-- 密炼生产计划维护：新增胶料ID和胶料名称字段
SET NAMES utf8mb4;
ALTER TABLE `mes_xsl_mixing_production_plan`
ADD COLUMN IF NOT EXISTS `material_id` varchar(32) DEFAULT NULL COMMENT '胶料ID（mes_material.id）' AFTER `source_order_id`,
ADD COLUMN IF NOT EXISTS `material_name` varchar(128) DEFAULT NULL COMMENT '胶料名称（取母胶/终胶计划mesMaterialName）' AFTER `material_id`;

6
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_138__mes_xsl_mixing_production_plan_fix_material_id_definition.sql Normal file
View File

@@ -0,0 +1,6 @@
-- 密炼生产计划维护：修正胶料ID字段定义为mes_material主键ID
SET NAMES utf8mb4;
ALTER TABLE `mes_xsl_mixing_production_plan`
MODIFY COLUMN `material_id` varchar(32) DEFAULT NULL COMMENT '胶料ID（mes_material.id）';

7
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_139__mes_xsl_mixing_production_plan_add_plan_no.sql Normal file
View File

@@ -0,0 +1,7 @@
-- 密炼生产计划维护：新增计划号字段
SET NAMES utf8mb4;
ALTER TABLE `mes_xsl_mixing_production_plan`
ADD COLUMN IF NOT EXISTS `plan_no` varchar(32) DEFAULT NULL COMMENT '计划号（yyyyMMddA三位流水）' AFTER `plan_date`,
ADD INDEX `idx_mxmp_plan_no` (`plan_no`);