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 15:47:53 +08:00
parent e28352f8ea
commit 7d7198b802
44 changed files with 2074 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -0,0 +1,33 @@
SET NAMES utf8mb4;
-- 视图1：橡胶及配合剂（自动）
DROP VIEW IF EXISTS `vw_mes_xsl_mixing_spec_material_auto`;
CREATE VIEW `vw_mes_xsl_mixing_spec_material_auto` AS
SELECT
CONCAT(
COALESCE(TRIM(s.spec_name), ''),
'-自动-',
COALESCE(NULLIF(TRIM(s.machine_name), ''), '')
) AS `spec_name`,
m.`mixer_material_name` AS `mixer_material_name`,
m.`unit_weight` AS `unit_weight`
FROM `mes_xsl_mixing_spec_material` m
INNER JOIN `mes_xsl_mixing_spec` s ON s.`id` = m.`mixing_spec_id`
WHERE (s.`del_flag` = 0 OR s.`del_flag` IS NULL)
AND TRIM(COALESCE(m.`material_kind`, '')) = '自动';
-- 视图2：橡胶及配合剂（人工）
DROP VIEW IF EXISTS `vw_mes_xsl_mixing_spec_material_manual`;
CREATE VIEW `vw_mes_xsl_mixing_spec_material_manual` AS
SELECT
CONCAT(
COALESCE(TRIM(s.spec_name), ''),
'-人工-',
COALESCE(NULLIF(TRIM(s.machine_name), ''), '')
) AS `spec_name`,
m.`mixer_material_name` AS `mixer_material_name`,
m.`unit_weight` AS `unit_weight`
FROM `mes_xsl_mixing_spec_material` m
INNER JOIN `mes_xsl_mixing_spec` s ON s.`id` = m.`mixing_spec_id`
WHERE (s.`del_flag` = 0 OR s.`del_flag` IS NULL)
AND TRIM(COALESCE(m.`material_kind`, '')) = '人工';

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

@@ -0,0 +1,45 @@
SET NAMES utf8mb4;
-- 自动小料需求计划
CREATE TABLE IF NOT EXISTS `mes_xsl_auto_small_material_demand_plan` (
`id` varchar(32) NOT NULL COMMENT '主键',
`stat_date` date DEFAULT NULL COMMENT '统计日期',
`machine_id` varchar(32) DEFAULT NULL COMMENT '机台ID',
`machine_name` varchar(64) DEFAULT NULL COMMENT '机台名称',
`raw_material_name` varchar(128) NOT NULL COMMENT '原材料名称',
`demand_weight` decimal(18,6) DEFAULT '0.000000' COMMENT '需求重量(KG)',
`tenant_id` int DEFAULT NULL COMMENT '租户ID',
`sys_org_code` varchar(64) DEFAULT NULL COMMENT '所属部门',
`create_by` varchar(50) DEFAULT NULL COMMENT '创建人',
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
`update_by` varchar(50) DEFAULT NULL COMMENT '修改人',
`update_time` datetime DEFAULT NULL COMMENT '修改时间',
`del_flag` tinyint(1) DEFAULT '0' COMMENT '删除标识(0-正常,1-删除)',
PRIMARY KEY (`id`),
KEY `idx_auto_small_date` (`stat_date`),
KEY `idx_auto_small_machine` (`machine_name`),
KEY `idx_auto_small_material` (`raw_material_name`),
KEY `idx_auto_small_del` (`del_flag`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='自动小料需求计划';
-- 人工小料需求计划
CREATE TABLE IF NOT EXISTS `mes_xsl_manual_small_material_demand_plan` (
`id` varchar(32) NOT NULL COMMENT '主键',
`stat_date` date DEFAULT NULL COMMENT '统计日期',
`machine_id` varchar(32) DEFAULT NULL COMMENT '机台ID',
`machine_name` varchar(64) DEFAULT NULL COMMENT '机台名称',
`raw_material_name` varchar(128) NOT NULL COMMENT '原材料名称',
`demand_weight` decimal(18,6) DEFAULT '0.000000' COMMENT '需求重量(KG)',
`tenant_id` int DEFAULT NULL COMMENT '租户ID',
`sys_org_code` varchar(64) DEFAULT NULL COMMENT '所属部门',
`create_by` varchar(50) DEFAULT NULL COMMENT '创建人',
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
`update_by` varchar(50) DEFAULT NULL COMMENT '修改人',
`update_time` datetime DEFAULT NULL COMMENT '修改时间',
`del_flag` tinyint(1) DEFAULT '0' COMMENT '删除标识(0-正常,1-删除)',
PRIMARY KEY (`id`),
KEY `idx_manual_small_date` (`stat_date`),
KEY `idx_manual_small_machine` (`machine_name`),
KEY `idx_manual_small_material` (`raw_material_name`),
KEY `idx_manual_small_del` (`del_flag`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='人工小料需求计划';

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

@@ -0,0 +1,51 @@
SET NAMES utf8mb4;
-- 自动小料计划维护
CREATE TABLE IF NOT EXISTS `mes_xsl_auto_small_material_plan_maintain` (
`id` varchar(32) NOT NULL COMMENT '主键',
`sort_no` int DEFAULT NULL COMMENT '排序号',
`formula_name` varchar(128) DEFAULT NULL COMMENT '配方名称',
`morning_seq_no` int DEFAULT NULL COMMENT '早班序号',
`morning_plan_count` int DEFAULT NULL COMMENT '早班计划',
`morning_remark` varchar(500) DEFAULT NULL COMMENT '早班备注',
`noon_seq_no` int DEFAULT NULL COMMENT '中班序号',
`noon_plan_count` int DEFAULT NULL COMMENT '中班计划',
`noon_remark` varchar(500) DEFAULT NULL COMMENT '中班备注',
`night_seq_no` int DEFAULT NULL COMMENT '夜班序号',
`night_plan_count` int DEFAULT NULL COMMENT '夜班计划',
`night_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_auto_small_plan_sort` (`sort_no`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='自动小料计划维护';
-- 人工小料计划维护
CREATE TABLE IF NOT EXISTS `mes_xsl_manual_small_material_plan_maintain` (
`id` varchar(32) NOT NULL COMMENT '主键',
`sort_no` int DEFAULT NULL COMMENT '排序号',
`formula_name` varchar(128) DEFAULT NULL COMMENT '配方名称',
`morning_seq_no` int DEFAULT NULL COMMENT '早班序号',
`morning_plan_count` int DEFAULT NULL COMMENT '早班计划',
`morning_remark` varchar(500) DEFAULT NULL COMMENT '早班备注',
`noon_seq_no` int DEFAULT NULL COMMENT '中班序号',
`noon_plan_count` int DEFAULT NULL COMMENT '中班计划',
`noon_remark` varchar(500) DEFAULT NULL COMMENT '中班备注',
`night_seq_no` int DEFAULT NULL COMMENT '夜班序号',
`night_plan_count` int DEFAULT NULL COMMENT '夜班计划',
`night_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_manual_small_plan_sort` (`sort_no`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='人工小料计划维护';

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

@@ -0,0 +1,9 @@
-- 密炼生产计划维护：补充保存字段（当前日期、生产订单ID）
SET NAMES utf8mb4;
ALTER TABLE `mes_xsl_mixing_production_plan`
ADD COLUMN IF NOT EXISTS `plan_date` date DEFAULT NULL COMMENT '计划日期（保存时写入当前日期）' AFTER `machine_name`,
ADD COLUMN IF NOT EXISTS `morning_source_order_id` varchar(32) DEFAULT NULL COMMENT '早班生产订单ID' AFTER `morning_plan_type`,
ADD COLUMN IF NOT EXISTS `noon_source_order_id` varchar(32) DEFAULT NULL COMMENT '中班生产订单ID' AFTER `noon_plan_type`,
ADD COLUMN IF NOT EXISTS `night_source_order_id` varchar(32) DEFAULT NULL COMMENT '晚班生产订单ID' AFTER `night_plan_type`;