Compare commits
7 Commits
38f22ef8bd
...
生产及设备基础资料
| Author | SHA1 | Date | |
|---|---|---|---|
| cbbbabe4cf | |||
| 457089e271 | |||
|
1c5cede957 | ||
|
|
2d142dbc9c | ||
| a65ae7be60 | |||
| 69a60ca07b | |||
| 29efd6694f |
64
jeecg-boot/db/mes-fix-rubber-category-visible.sql
Normal file
64
jeecg-boot/db/mes-fix-rubber-category-visible.sql
Normal file
@@ -0,0 +1,64 @@
|
||||
-- 修复：胶料分类字典（XSLMES_RUBBER）数据库有数据但页面不展示
|
||||
-- 场景：开启多租户后，sys_category 的 tenant_id 与当前登录租户不一致/为空
|
||||
SET NAMES utf8mb4;
|
||||
|
||||
-- 1) 目标租户：默认取 admin 用户租户；若为空则回退到 0
|
||||
SET @target_tenant_id = (
|
||||
SELECT COALESCE(tenant_id, 0)
|
||||
FROM sys_user
|
||||
WHERE username = 'admin'
|
||||
ORDER BY create_time ASC
|
||||
LIMIT 1
|
||||
);
|
||||
SET @target_tenant_id = IFNULL(@target_tenant_id, 0);
|
||||
|
||||
-- 2) 定位根分类编码
|
||||
SET @rubber_code = 'XSLMES_RUBBER';
|
||||
|
||||
-- 若根节点不存在则补一个最小根节点（避免前端 pcode 查询直接失败）
|
||||
INSERT INTO sys_category (id, pid, name, code, has_child, tenant_id, create_by, create_time, update_by, update_time)
|
||||
SELECT '1994000000000000001', '0', 'MES胶料分类', @rubber_code, '1', @target_tenant_id, 'admin', NOW(), 'admin', NOW()
|
||||
FROM dual
|
||||
WHERE NOT EXISTS (
|
||||
SELECT 1 FROM sys_category WHERE code = @rubber_code
|
||||
);
|
||||
|
||||
SET @rubber_root_id = (
|
||||
SELECT id
|
||||
FROM sys_category
|
||||
WHERE code = @rubber_code
|
||||
ORDER BY create_time ASC
|
||||
LIMIT 1
|
||||
);
|
||||
|
||||
-- 3) 若根节点存在，统一修复租户与父子标记
|
||||
UPDATE sys_category
|
||||
SET tenant_id = @target_tenant_id
|
||||
WHERE id = @rubber_root_id;
|
||||
|
||||
UPDATE sys_category
|
||||
SET tenant_id = @target_tenant_id
|
||||
WHERE pid = @rubber_root_id;
|
||||
|
||||
-- 根节点是否有子节点，按真实数据回写
|
||||
UPDATE sys_category
|
||||
SET has_child = CASE
|
||||
WHEN EXISTS (SELECT 1 FROM (SELECT id FROM sys_category WHERE pid = @rubber_root_id LIMIT 1) t) THEN '1'
|
||||
ELSE '0'
|
||||
END
|
||||
WHERE id = @rubber_root_id;
|
||||
|
||||
-- 子节点统一标记为无子（当前这批分类通常为叶子）
|
||||
UPDATE sys_category
|
||||
SET has_child = '0'
|
||||
WHERE pid = @rubber_root_id;
|
||||
|
||||
-- 4) 结果检查（执行后看返回）
|
||||
SELECT 'ROOT' AS level_tag, id, pid, code, name, tenant_id, has_child
|
||||
FROM sys_category
|
||||
WHERE id = @rubber_root_id
|
||||
UNION ALL
|
||||
SELECT 'CHILD' AS level_tag, id, pid, code, name, tenant_id, has_child
|
||||
FROM sys_category
|
||||
WHERE pid = @rubber_root_id
|
||||
ORDER BY level_tag, code;
|
||||
@@ -0,0 +1,60 @@
|
||||
-- MES 设备报警记录、设备停机记录：菜单 + 导出按钮 + 租户 admin 授权（无 MySQL 业务表）
|
||||
-- 权限前缀：mes:mes_xsl_equip_alarm_record:* / mes:mes_xsl_equip_downtime_record:*
|
||||
-- 父菜单：设备管理；Flyway：V3.9.2_124__mes_xsl_equip_mcs_alarm_downtime_menu.sql
|
||||
SET NAMES utf8mb4;
|
||||
|
||||
SET @mes_tenant_id = 1002;
|
||||
|
||||
SET @mes_equip_pid = (
|
||||
SELECT `id` FROM `sys_permission`
|
||||
WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` = '设备管理'
|
||||
LIMIT 1
|
||||
);
|
||||
SET @mes_equip_pid = IFNULL(@mes_equip_pid, '1860000000000000133');
|
||||
|
||||
INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `keep_alive`, `internal_or_external`, `create_by`, `create_time`)
|
||||
VALUES ('1860000000000000222', @mes_equip_pid, '设备报警记录', '/xslmes/mesXslEquipAlarmRecord', 'xslmes/mesXslEquipAlarmRecord/MesXslEquipAlarmRecordList', 'MesXslEquipAlarmRecordList', 1, NULL, '1', 13, 1, 0, 0, '1', 0, 1, 0, 'admin', NOW())
|
||||
ON DUPLICATE KEY UPDATE
|
||||
`parent_id` = VALUES(`parent_id`), `name` = VALUES(`name`), `url` = VALUES(`url`), `component` = VALUES(`component`), `component_name` = VALUES(`component_name`),
|
||||
`menu_type` = VALUES(`menu_type`), `perms` = VALUES(`perms`), `perms_type` = VALUES(`perms_type`), `sort_no` = VALUES(`sort_no`),
|
||||
`is_route` = VALUES(`is_route`), `is_leaf` = VALUES(`is_leaf`), `hidden` = VALUES(`hidden`), `status` = VALUES(`status`), `del_flag` = VALUES(`del_flag`),
|
||||
`keep_alive` = VALUES(`keep_alive`), `internal_or_external` = VALUES(`internal_or_external`);
|
||||
|
||||
UPDATE `sys_permission` SET `icon` = 'ant-design:alert-outlined' WHERE `id` = '1860000000000000222' AND `del_flag` = 0;
|
||||
|
||||
INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `status`, `del_flag`, `create_by`, `create_time`) VALUES
|
||||
('1860000000000000223', '1860000000000000222', '导出', 2, 'mes:mes_xsl_equip_alarm_record:exportXls', '1', '1', 0, 'admin', NOW())
|
||||
ON DUPLICATE KEY UPDATE
|
||||
`parent_id` = VALUES(`parent_id`), `name` = VALUES(`name`), `menu_type` = VALUES(`menu_type`), `perms` = VALUES(`perms`), `perms_type` = VALUES(`perms_type`),
|
||||
`status` = VALUES(`status`), `del_flag` = VALUES(`del_flag`);
|
||||
|
||||
INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `keep_alive`, `internal_or_external`, `create_by`, `create_time`)
|
||||
VALUES ('1860000000000000224', @mes_equip_pid, '设备停机记录', '/xslmes/mesXslEquipDowntimeRecord', 'xslmes/mesXslEquipDowntimeRecord/MesXslEquipDowntimeRecordList', 'MesXslEquipDowntimeRecordList', 1, NULL, '1', 15, 1, 0, 0, '1', 0, 1, 0, 'admin', NOW())
|
||||
ON DUPLICATE KEY UPDATE
|
||||
`parent_id` = VALUES(`parent_id`), `name` = VALUES(`name`), `url` = VALUES(`url`), `component` = VALUES(`component`), `component_name` = VALUES(`component_name`),
|
||||
`menu_type` = VALUES(`menu_type`), `perms` = VALUES(`perms`), `perms_type` = VALUES(`perms_type`), `sort_no` = VALUES(`sort_no`),
|
||||
`is_route` = VALUES(`is_route`), `is_leaf` = VALUES(`is_leaf`), `hidden` = VALUES(`hidden`), `status` = VALUES(`status`), `del_flag` = VALUES(`del_flag`),
|
||||
`keep_alive` = VALUES(`keep_alive`), `internal_or_external` = VALUES(`internal_or_external`);
|
||||
|
||||
UPDATE `sys_permission` SET `icon` = 'ant-design:pause-circle-outlined' WHERE `id` = '1860000000000000224' AND `del_flag` = 0;
|
||||
|
||||
INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `status`, `del_flag`, `create_by`, `create_time`) VALUES
|
||||
('1860000000000000225', '1860000000000000224', '导出', 2, 'mes:mes_xsl_equip_downtime_record:exportXls', '1', '1', 0, 'admin', NOW())
|
||||
ON DUPLICATE KEY UPDATE
|
||||
`parent_id` = VALUES(`parent_id`), `name` = VALUES(`name`), `menu_type` = VALUES(`menu_type`), `perms` = VALUES(`perms`), `perms_type` = VALUES(`perms_type`),
|
||||
`status` = VALUES(`status`), `del_flag` = VALUES(`del_flag`);
|
||||
|
||||
INSERT INTO `sys_role_permission`(`id`, `role_id`, `permission_id`, `operate_date`, `operate_ip`)
|
||||
SELECT REPLACE(UUID(), '-', ''), r.`id`, p.`id`, NOW(), '127.0.0.1'
|
||||
FROM `sys_role` r
|
||||
CROSS JOIN `sys_permission` p
|
||||
WHERE r.`tenant_id` = @mes_tenant_id
|
||||
AND r.`role_code` = 'admin'
|
||||
AND p.`id` IN (
|
||||
'1860000000000000222', '1860000000000000223',
|
||||
'1860000000000000224', '1860000000000000225'
|
||||
)
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM `sys_role_permission` rp
|
||||
WHERE rp.`role_id` = r.`id` AND rp.`permission_id` = p.`id`
|
||||
);
|
||||
65
jeecg-boot/db/mes-xsl-equip-part-mapping-menu-permission.sql
Normal file
65
jeecg-boot/db/mes-xsl-equip-part-mapping-menu-permission.sql
Normal file
@@ -0,0 +1,65 @@
|
||||
-- MES 设备对应部位：建表 + 菜单 + 按钮 + 租户 admin 授权（可整文件一次执行）
|
||||
-- 权限前缀：mes:mes_xsl_equip_part_mapping:*
|
||||
-- 数据由设备点检配置保存后自动生成，列表无手工新增
|
||||
-- Flyway：V3.9.2_123__mes_xsl_equip_part_mapping.sql
|
||||
SET NAMES utf8mb4;
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `mes_xsl_equip_part_mapping` (
|
||||
`id` varchar(32) NOT NULL COMMENT '主键',
|
||||
`equipment_ledger_id` varchar(32) NOT NULL COMMENT '设备台账主键 mes_xsl_equipment_ledger.id',
|
||||
`equipment_name` varchar(500) NOT NULL COMMENT '设备名称',
|
||||
`machine_code` varchar(500) DEFAULT NULL COMMENT '机台代号（设备编号冗余）',
|
||||
`equipment_part_id` varchar(32) NOT NULL COMMENT '设备大部位主键 mes_xsl_equipment_part.id',
|
||||
`equipment_part_name` varchar(500) DEFAULT NULL COMMENT '设备大部位名称',
|
||||
`part_code` varchar(500) DEFAULT NULL COMMENT '大部位代码',
|
||||
`equipment_sub_part_id` varchar(32) NOT NULL COMMENT '设备小部位主键 mes_xsl_equipment_sub_part.id',
|
||||
`equipment_sub_part_name` varchar(500) DEFAULT NULL COMMENT '设备小部位名称',
|
||||
`sub_part_code` 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`),
|
||||
UNIQUE KEY `uk_mepm_ledger_part_sub` (`equipment_ledger_id`, `equipment_part_id`, `equipment_sub_part_id`),
|
||||
KEY `idx_mepm_tenant_equip_name` (`tenant_id`, `equipment_name`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES设备对应部位';
|
||||
|
||||
SET @mes_tenant_id = 1002;
|
||||
|
||||
SET @mes_equip_pid = (
|
||||
SELECT `id` FROM `sys_permission`
|
||||
WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` = '设备管理'
|
||||
LIMIT 1
|
||||
);
|
||||
SET @mes_equip_pid = IFNULL(@mes_equip_pid, '1860000000000000133');
|
||||
|
||||
INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `keep_alive`, `internal_or_external`, `create_by`, `create_time`)
|
||||
VALUES ('1860000000000000215', @mes_equip_pid, '设备对应部位', '/xslmes/mesXslEquipPartMapping', 'xslmes/mesXslEquipPartMapping/MesXslEquipPartMappingList', 'MesXslEquipPartMappingList', 1, NULL, '1', 14, 1, 0, 0, '1', 0, 1, 0, 'admin', NOW())
|
||||
ON DUPLICATE KEY UPDATE
|
||||
`parent_id` = VALUES(`parent_id`), `name` = VALUES(`name`), `url` = VALUES(`url`), `component` = VALUES(`component`), `component_name` = VALUES(`component_name`),
|
||||
`menu_type` = VALUES(`menu_type`), `perms` = VALUES(`perms`), `perms_type` = VALUES(`perms_type`), `sort_no` = VALUES(`sort_no`),
|
||||
`is_route` = VALUES(`is_route`), `is_leaf` = VALUES(`is_leaf`), `hidden` = VALUES(`hidden`), `status` = VALUES(`status`), `del_flag` = VALUES(`del_flag`),
|
||||
`keep_alive` = VALUES(`keep_alive`), `internal_or_external` = VALUES(`internal_or_external`), `icon` = 'ant-design:apartment-outlined';
|
||||
|
||||
UPDATE `sys_permission` SET `icon` = 'ant-design:apartment-outlined' WHERE `id` = '1860000000000000215' AND `del_flag` = 0;
|
||||
|
||||
INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `status`, `del_flag`, `create_by`, `create_time`) VALUES
|
||||
('1860000000000000216', '1860000000000000215', '导出', 2, 'mes:mes_xsl_equip_part_mapping:exportXls', '1', '1', 0, 'admin', NOW())
|
||||
ON DUPLICATE KEY UPDATE
|
||||
`parent_id` = VALUES(`parent_id`), `name` = VALUES(`name`), `menu_type` = VALUES(`menu_type`), `perms` = VALUES(`perms`), `perms_type` = VALUES(`perms_type`),
|
||||
`status` = VALUES(`status`), `del_flag` = VALUES(`del_flag`);
|
||||
|
||||
INSERT INTO `sys_role_permission`(`id`, `role_id`, `permission_id`, `operate_date`, `operate_ip`)
|
||||
SELECT REPLACE(UUID(), '-', ''), r.`id`, p.`id`, NOW(), '127.0.0.1'
|
||||
FROM `sys_role` r
|
||||
CROSS JOIN `sys_permission` p
|
||||
WHERE r.`tenant_id` = @mes_tenant_id
|
||||
AND r.`role_code` = 'admin'
|
||||
AND p.`id` IN ('1860000000000000215', '1860000000000000216')
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM `sys_role_permission` rp
|
||||
WHERE rp.`role_id` = r.`id` AND rp.`permission_id` = p.`id`
|
||||
);
|
||||
@@ -23,6 +23,7 @@ CREATE TABLE IF NOT EXISTS `mes_xsl_equipment_ledger` (
|
||||
`process_operation_id` varchar(32) NOT NULL COMMENT '所属工序 mes_xsl_process_operation.id',
|
||||
`process_operation_name` varchar(500) DEFAULT NULL COMMENT '工序名称冗余',
|
||||
`equipment_name` varchar(500) NOT NULL COMMENT '设备名称（同租户未删除唯一）',
|
||||
`ledger_no` varchar(16) DEFAULT NULL COMMENT '编号（租户内从001递增自动生成，只读）',
|
||||
`equipment_code` varchar(128) NOT NULL COMMENT '设备编号（同租户未删除唯一）',
|
||||
`manufacturer_id` varchar(32) DEFAULT NULL COMMENT '所属设备厂家 mes_xsl_manufacturer.id',
|
||||
`manufacturer_name` varchar(500) DEFAULT NULL COMMENT '设备厂家名称冗余',
|
||||
@@ -59,6 +60,7 @@ CREATE TABLE IF NOT EXISTS `mes_xsl_equipment_ledger` (
|
||||
`del_flag` int DEFAULT '0' COMMENT '删除标记（0正常1删除）',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `idx_mel_tenant_code` (`tenant_id`, `equipment_code`),
|
||||
KEY `idx_mel_tenant_ledger_no` (`tenant_id`, `ledger_no`),
|
||||
KEY `idx_mel_tenant_name` (`tenant_id`, `equipment_name`),
|
||||
KEY `idx_mel_process` (`process_operation_id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES设备台账';
|
||||
|
||||
@@ -6,7 +6,8 @@ CREATE TABLE IF NOT EXISTS `mes_xsl_equipment_ledger` (
|
||||
`process_operation_id` varchar(32) NOT NULL COMMENT '所属工序',
|
||||
`process_operation_name` varchar(500) DEFAULT NULL COMMENT '工序名称冗余',
|
||||
`equipment_name` varchar(500) NOT NULL COMMENT '设备名称',
|
||||
`equipment_code` varchar(128) NOT NULL COMMENT '设备编号',
|
||||
`ledger_no` varchar(16) DEFAULT NULL COMMENT '编号（租户内从001递增自动生成，只读）',
|
||||
`equipment_code` varchar(128) NOT NULL COMMENT '设备编号（同租户不可重复）',
|
||||
`manufacturer_id` varchar(32) DEFAULT NULL COMMENT '所属设备厂家',
|
||||
`manufacturer_name` varchar(500) DEFAULT NULL COMMENT '设备厂家名称冗余',
|
||||
`equipment_category_id` varchar(32) DEFAULT NULL COMMENT '设备类别',
|
||||
@@ -42,5 +43,6 @@ CREATE TABLE IF NOT EXISTS `mes_xsl_equipment_ledger` (
|
||||
`del_flag` int DEFAULT '0' COMMENT '删除标记',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `idx_mel_tenant_code` (`tenant_id`, `equipment_code`),
|
||||
KEY `idx_mel_tenant_ledger_no` (`tenant_id`, `ledger_no`),
|
||||
KEY `idx_mel_tenant_name` (`tenant_id`, `equipment_name`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES设备台账';
|
||||
|
||||
@@ -678,3 +678,88 @@ jeecgboot-vue3/src/views/xslmes/mesXslRubberSmallLockLog/MesXslRubberSmallLockLo
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslRubberSmallLockLog/MesXslRubberSmallLockLog.api.ts
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslRubberSmallLockLog/MesXslRubberSmallLockLogList.vue
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslRubberSmallLockLog/components/MesXslRubberSmallLockLogModal.vue
|
||||
|
||||
-- author:jiangxh---date:20250602--for: 【MES】设备台账原设备编号改为自定义编号、新增001自增只读系统编号 ---
|
||||
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_122__mes_xsl_equipment_ledger_ledger_no.sql
|
||||
jeecg-boot/db/mes-xsl-equipment-ledger.sql
|
||||
jeecg-boot/db/mes-xsl-equipment-ledger-menu-permission.sql
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslEquipmentLedger.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslEquipmentLedgerMapper.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslEquipmentLedgerService.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslEquipmentLedgerServiceImpl.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslEquipmentLedgerController.java
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslEquipmentLedger/MesXslEquipmentLedger.data.ts
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslEquipmentLedger/MesXslEquipmentLedger.api.ts
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslEquipmentLedger/components/MesXslEquipmentLedgerModal.vue
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/components/MesXslEquipmentLedgerSelectModal.vue
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/components/MesXslEquipmentLedgerMultiSelectModal.vue
|
||||
|
||||
-- author:jiangxh---date:20250602--for: 【MES】设备台账设备类别、设备类型必填 ---
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslEquipmentLedger/MesXslEquipmentLedger.data.ts
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslEquipmentLedgerController.java
|
||||
|
||||
-- author:jiangxh---date:20250602--for: 【MES】设备台账 ledgerNo 显示名改为设备编号 ---
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslEquipmentLedger/MesXslEquipmentLedger.data.ts
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslEquipmentLedger.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslEquipmentLedgerController.java
|
||||
|
||||
-- author:jiangxh---date:20250602--for: 【MES】设备台账 ledgerNo 显示名改为系统编号、equipmentCode 改为设备编号 ---
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslEquipmentLedger/MesXslEquipmentLedger.data.ts
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslEquipmentLedger.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslEquipmentLedgerController.java
|
||||
|
||||
-- author:jiangxh---date:20250603--for: 【MES】设备对应部位：点检配置保存后按大部位+小部位去重生成，列表只读无新增 ---
|
||||
jeecg-boot/db/mes-xsl-equip-part-mapping-menu-permission.sql
|
||||
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_123__mes_xsl_equip_part_mapping.sql
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslEquipPartMapping.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslEquipPartMappingMapper.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslEquipPartMappingService.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslEquipPartMappingServiceImpl.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslEquipPartMappingController.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslEquipInspectConfigServiceImpl.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/package-info.java
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslEquipPartMapping/MesXslEquipPartMappingList.vue
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslEquipPartMapping/MesXslEquipPartMapping.data.ts
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslEquipPartMapping/MesXslEquipPartMapping.api.ts
|
||||
|
||||
-- author:jiangxh---date:20250603--for: 【MES】设备/质量管理主数据删除前引用校验（统一点检配置等下游阻断） ---
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslDeleteReferenceService.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslDeleteReferenceServiceImpl.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslInspectMaintainItemController.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslEquipmentCategoryController.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslEquipmentTypeController.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslEquipmentPartController.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslEquipmentSubPartController.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslEquipmentLedgerController.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslManufacturerController.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslSparePartsCategoryController.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslDowntimeMainTypeController.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslDowntimeTypeController.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslEquipInspectConfigController.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslRubberQuickTestTypeController.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslRubberQuickTestDataPointController.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslRubberQuickTestMethodController.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslRubberQuickTestStdController.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslRubberSmallLockReasonController.java
|
||||
|
||||
-- author:jiangxh---date:20250604--for: 【MES】设备报警记录与设备停机记录（SQL Server MCSToMES_MixAlarm 只读、列表回写 ReadTime/MES_Flag） ---
|
||||
jeecg-boot/db/mes-xsl-equip-mcs-alarm-downtime-menu-permission.sql
|
||||
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_124__mes_xsl_equip_mcs_alarm_downtime_menu.sql
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/vo/MesXslEquipAlarmRecordVO.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/vo/MesXslEquipDowntimeRecordVO.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/util/MesXslMcsMixAlarmConvertUtil.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/service/IMesXslEquipAlarmRecordService.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/service/IMesXslEquipDowntimeRecordService.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/service/impl/MesXslMcsMixAlarmReadMarker.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/service/impl/MesXslEquipAlarmRecordServiceImpl.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/service/impl/MesXslEquipDowntimeRecordServiceImpl.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslEquipAlarmRecordController.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslEquipDowntimeRecordController.java
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslEquipAlarmRecord/MesXslEquipAlarmRecord.api.ts
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslEquipAlarmRecord/MesXslEquipAlarmRecord.data.ts
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslEquipAlarmRecord/MesXslEquipAlarmRecordList.vue
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslEquipAlarmRecord/components/MesXslEquipAlarmRecordModal.vue
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslEquipDowntimeRecord/MesXslEquipDowntimeRecord.api.ts
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslEquipDowntimeRecord/MesXslEquipDowntimeRecord.data.ts
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslEquipDowntimeRecord/MesXslEquipDowntimeRecordList.vue
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslEquipDowntimeRecord/components/MesXslEquipDowntimeRecordModal.vue
|
||||
|
||||
@@ -25,6 +25,7 @@ import org.jeecg.common.system.query.QueryGenerator;
|
||||
import org.jeecg.common.util.oConvertUtils;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslDowntimeMainType;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslProcessOperation;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslDeleteReferenceService;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslDowntimeMainTypeService;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslProcessOperationService;
|
||||
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
||||
@@ -53,6 +54,9 @@ public class MesXslDowntimeMainTypeController extends JeecgController<MesXslDown
|
||||
@Autowired
|
||||
private IMesXslProcessOperationService mesXslProcessOperationService;
|
||||
|
||||
@Autowired
|
||||
private IMesXslDeleteReferenceService mesXslDeleteReferenceService;
|
||||
|
||||
@Operation(summary = "MES停机主类型-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<MesXslDowntimeMainType>> queryPageList(
|
||||
@@ -104,6 +108,10 @@ public class MesXslDowntimeMainTypeController extends JeecgController<MesXslDown
|
||||
@RequiresPermissions("mes:mes_xsl_downtime_main_type:delete")
|
||||
@DeleteMapping(value = "/delete")
|
||||
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
|
||||
String refErr = mesXslDeleteReferenceService.validateDowntimeMainTypeDelete(List.of(id));
|
||||
if (refErr != null) {
|
||||
return Result.error(refErr);
|
||||
}
|
||||
mesXslDowntimeMainTypeService.removeById(id);
|
||||
return Result.OK("删除成功!");
|
||||
}
|
||||
@@ -113,6 +121,10 @@ public class MesXslDowntimeMainTypeController extends JeecgController<MesXslDown
|
||||
@RequiresPermissions("mes:mes_xsl_downtime_main_type:deleteBatch")
|
||||
@DeleteMapping(value = "/deleteBatch")
|
||||
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
||||
String refErr = mesXslDeleteReferenceService.validateDowntimeMainTypeDelete(Arrays.asList(ids.split(",")));
|
||||
if (refErr != null) {
|
||||
return Result.error(refErr);
|
||||
}
|
||||
mesXslDowntimeMainTypeService.removeByIds(Arrays.asList(ids.split(",")));
|
||||
return Result.OK("批量删除成功!");
|
||||
}
|
||||
|
||||
@@ -26,6 +26,7 @@ import org.jeecg.common.util.oConvertUtils;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslDowntimeMainType;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslDowntimeType;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslProcessOperation;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslDeleteReferenceService;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslDowntimeMainTypeService;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslDowntimeTypeService;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslProcessOperationService;
|
||||
@@ -59,6 +60,9 @@ public class MesXslDowntimeTypeController extends JeecgController<MesXslDowntime
|
||||
@Autowired
|
||||
private IMesXslDowntimeMainTypeService mesXslDowntimeMainTypeService;
|
||||
|
||||
@Autowired
|
||||
private IMesXslDeleteReferenceService mesXslDeleteReferenceService;
|
||||
|
||||
@Operation(summary = "MES停机类型-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<MesXslDowntimeType>> queryPageList(
|
||||
@@ -110,6 +114,10 @@ public class MesXslDowntimeTypeController extends JeecgController<MesXslDowntime
|
||||
@RequiresPermissions("mes:mes_xsl_downtime_type:delete")
|
||||
@DeleteMapping(value = "/delete")
|
||||
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
|
||||
String refErr = mesXslDeleteReferenceService.validateDowntimeTypeDelete(List.of(id));
|
||||
if (refErr != null) {
|
||||
return Result.error(refErr);
|
||||
}
|
||||
mesXslDowntimeTypeService.removeById(id);
|
||||
return Result.OK("删除成功!");
|
||||
}
|
||||
@@ -119,6 +127,10 @@ public class MesXslDowntimeTypeController extends JeecgController<MesXslDowntime
|
||||
@RequiresPermissions("mes:mes_xsl_downtime_type:deleteBatch")
|
||||
@DeleteMapping(value = "/deleteBatch")
|
||||
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
||||
String refErr = mesXslDeleteReferenceService.validateDowntimeTypeDelete(Arrays.asList(ids.split(",")));
|
||||
if (refErr != null) {
|
||||
return Result.error(refErr);
|
||||
}
|
||||
mesXslDowntimeTypeService.removeByIds(Arrays.asList(ids.split(",")));
|
||||
return Result.OK("批量删除成功!");
|
||||
}
|
||||
|
||||
@@ -0,0 +1,86 @@
|
||||
package org.jeecg.modules.xslmes.controller;
|
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.shiro.SecurityUtils;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
import org.apache.shiro.subject.Subject;
|
||||
import org.jeecg.common.api.vo.Result;
|
||||
import org.jeecg.common.system.vo.LoginUser;
|
||||
import org.jeecg.common.util.oConvertUtils;
|
||||
import org.jeecg.modules.xslmes.mcs.entity.McsToMesMixAlarm;
|
||||
import org.jeecg.modules.xslmes.mcs.service.IMesXslEquipAlarmRecordService;
|
||||
import org.jeecg.modules.xslmes.mcs.vo.MesXslEquipAlarmRecordVO;
|
||||
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
||||
import org.jeecgframework.poi.excel.entity.ExportParams;
|
||||
import org.jeecgframework.poi.excel.entity.enmus.ExcelType;
|
||||
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
/**
|
||||
* 设备报警记录（只读，数据来自 SQL Server MCSToMES_MixAlarm）
|
||||
*/
|
||||
@Tag(name = "MES设备报警记录")
|
||||
@RestController
|
||||
@RequestMapping("/xslmes/mesXslEquipAlarmRecord")
|
||||
@Slf4j
|
||||
public class MesXslEquipAlarmRecordController {
|
||||
|
||||
@Autowired
|
||||
private IMesXslEquipAlarmRecordService mesXslEquipAlarmRecordService;
|
||||
|
||||
@Operation(summary = "MES设备报警记录-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<MesXslEquipAlarmRecordVO>> queryPageList(
|
||||
McsToMesMixAlarm query,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
IPage<MesXslEquipAlarmRecordVO> pageList =
|
||||
mesXslEquipAlarmRecordService.queryPage(query, req.getParameterMap(), pageNo, pageSize);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
@Operation(summary = "MES设备报警记录-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<MesXslEquipAlarmRecordVO> queryById(@RequestParam(name = "id", required = true) String id) {
|
||||
MesXslEquipAlarmRecordVO entity = mesXslEquipAlarmRecordService.queryById(id);
|
||||
if (entity == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(entity);
|
||||
}
|
||||
|
||||
@RequiresPermissions("mes:mes_xsl_equip_alarm_record:exportXls")
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, McsToMesMixAlarm query) {
|
||||
List<MesXslEquipAlarmRecordVO> exportList =
|
||||
mesXslEquipAlarmRecordService.listForExport(query, request.getParameterMap());
|
||||
Subject subject = SecurityUtils.getSubject();
|
||||
LoginUser sysUser = subject != null && subject.getPrincipal() instanceof LoginUser
|
||||
? (LoginUser) subject.getPrincipal()
|
||||
: null;
|
||||
String exporter = sysUser == null || oConvertUtils.isEmpty(sysUser.getRealname()) ? "admin" : sysUser.getRealname();
|
||||
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
|
||||
mv.addObject(NormalExcelConstants.FILE_NAME, "设备报警记录");
|
||||
mv.addObject(NormalExcelConstants.CLASS, MesXslEquipAlarmRecordVO.class);
|
||||
mv.addObject(
|
||||
NormalExcelConstants.PARAMS,
|
||||
new ExportParams("设备报警记录", "导出人:" + exporter, "设备报警记录", ExcelType.XSSF));
|
||||
mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
|
||||
String exportFields = request.getParameter(NormalExcelConstants.EXPORT_FIELDS);
|
||||
if (oConvertUtils.isNotEmpty(exportFields)) {
|
||||
mv.addObject(NormalExcelConstants.EXPORT_FIELDS, exportFields);
|
||||
}
|
||||
return mv;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,86 @@
|
||||
package org.jeecg.modules.xslmes.controller;
|
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.shiro.SecurityUtils;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
import org.apache.shiro.subject.Subject;
|
||||
import org.jeecg.common.api.vo.Result;
|
||||
import org.jeecg.common.system.vo.LoginUser;
|
||||
import org.jeecg.common.util.oConvertUtils;
|
||||
import org.jeecg.modules.xslmes.mcs.entity.McsToMesMixAlarm;
|
||||
import org.jeecg.modules.xslmes.mcs.service.IMesXslEquipDowntimeRecordService;
|
||||
import org.jeecg.modules.xslmes.mcs.vo.MesXslEquipDowntimeRecordVO;
|
||||
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
||||
import org.jeecgframework.poi.excel.entity.ExportParams;
|
||||
import org.jeecgframework.poi.excel.entity.enmus.ExcelType;
|
||||
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
/**
|
||||
* 设备停机记录（只读，数据来自 SQL Server MCSToMES_MixAlarm）
|
||||
*/
|
||||
@Tag(name = "MES设备停机记录")
|
||||
@RestController
|
||||
@RequestMapping("/xslmes/mesXslEquipDowntimeRecord")
|
||||
@Slf4j
|
||||
public class MesXslEquipDowntimeRecordController {
|
||||
|
||||
@Autowired
|
||||
private IMesXslEquipDowntimeRecordService mesXslEquipDowntimeRecordService;
|
||||
|
||||
@Operation(summary = "MES设备停机记录-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<MesXslEquipDowntimeRecordVO>> queryPageList(
|
||||
McsToMesMixAlarm query,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
IPage<MesXslEquipDowntimeRecordVO> pageList =
|
||||
mesXslEquipDowntimeRecordService.queryPage(query, req.getParameterMap(), pageNo, pageSize);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
@Operation(summary = "MES设备停机记录-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<MesXslEquipDowntimeRecordVO> queryById(@RequestParam(name = "id", required = true) String id) {
|
||||
MesXslEquipDowntimeRecordVO entity = mesXslEquipDowntimeRecordService.queryById(id);
|
||||
if (entity == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(entity);
|
||||
}
|
||||
|
||||
@RequiresPermissions("mes:mes_xsl_equip_downtime_record:exportXls")
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, McsToMesMixAlarm query) {
|
||||
List<MesXslEquipDowntimeRecordVO> exportList =
|
||||
mesXslEquipDowntimeRecordService.listForExport(query, request.getParameterMap());
|
||||
Subject subject = SecurityUtils.getSubject();
|
||||
LoginUser sysUser = subject != null && subject.getPrincipal() instanceof LoginUser
|
||||
? (LoginUser) subject.getPrincipal()
|
||||
: null;
|
||||
String exporter = sysUser == null || oConvertUtils.isEmpty(sysUser.getRealname()) ? "admin" : sysUser.getRealname();
|
||||
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
|
||||
mv.addObject(NormalExcelConstants.FILE_NAME, "设备停机记录");
|
||||
mv.addObject(NormalExcelConstants.CLASS, MesXslEquipDowntimeRecordVO.class);
|
||||
mv.addObject(
|
||||
NormalExcelConstants.PARAMS,
|
||||
new ExportParams("设备停机记录", "导出人:" + exporter, "设备停机记录", ExcelType.XSSF));
|
||||
mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
|
||||
String exportFields = request.getParameter(NormalExcelConstants.EXPORT_FIELDS);
|
||||
if (oConvertUtils.isNotEmpty(exportFields)) {
|
||||
mv.addObject(NormalExcelConstants.EXPORT_FIELDS, exportFields);
|
||||
}
|
||||
return mv;
|
||||
}
|
||||
}
|
||||
@@ -23,6 +23,7 @@ import org.jeecg.modules.xslmes.entity.MesXslEquipInspectConfig;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipInspectConfigLine;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipmentLedger;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslInspectMaintainItem;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslDeleteReferenceService;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslEquipInspectConfigService;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslEquipmentLedgerService;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslInspectMaintainItemService;
|
||||
@@ -53,6 +54,9 @@ public class MesXslEquipInspectConfigController
|
||||
@Autowired
|
||||
private IMesXslInspectMaintainItemService mesXslInspectMaintainItemService;
|
||||
|
||||
@Autowired
|
||||
private IMesXslDeleteReferenceService mesXslDeleteReferenceService;
|
||||
|
||||
@Operation(summary = "MES设备点检配置-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<MesXslEquipInspectConfig>> queryPageList(
|
||||
@@ -106,6 +110,10 @@ public class MesXslEquipInspectConfigController
|
||||
@RequiresPermissions("mes:mes_xsl_equip_inspect_config:delete")
|
||||
@DeleteMapping(value = "/delete")
|
||||
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
|
||||
String refErr = mesXslDeleteReferenceService.validateEquipInspectConfigDelete(List.of(id));
|
||||
if (refErr != null) {
|
||||
return Result.error(refErr);
|
||||
}
|
||||
mesXslEquipInspectConfigService.delMain(id);
|
||||
return Result.OK("删除成功!");
|
||||
}
|
||||
@@ -115,6 +123,10 @@ public class MesXslEquipInspectConfigController
|
||||
@RequiresPermissions("mes:mes_xsl_equip_inspect_config:deleteBatch")
|
||||
@DeleteMapping(value = "/deleteBatch")
|
||||
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
||||
String refErr = mesXslDeleteReferenceService.validateEquipInspectConfigDelete(Arrays.asList(ids.split(",")));
|
||||
if (refErr != null) {
|
||||
return Result.error(refErr);
|
||||
}
|
||||
mesXslEquipInspectConfigService.delBatchMain(Arrays.asList(ids.split(",")));
|
||||
return Result.OK("批量删除成功!");
|
||||
}
|
||||
|
||||
@@ -0,0 +1,57 @@
|
||||
package org.jeecg.modules.xslmes.controller;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
import org.jeecg.common.api.vo.Result;
|
||||
import org.jeecg.common.system.base.controller.JeecgController;
|
||||
import org.jeecg.common.system.query.QueryGenerator;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipPartMapping;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslEquipPartMappingService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
/**
|
||||
* MES 设备对应部位（只读列表，数据由设备点检配置保存后自动生成）
|
||||
*/
|
||||
@Tag(name = "MES设备对应部位")
|
||||
@RestController
|
||||
@RequestMapping("/xslmes/mesXslEquipPartMapping")
|
||||
@Slf4j
|
||||
public class MesXslEquipPartMappingController
|
||||
extends JeecgController<MesXslEquipPartMapping, IMesXslEquipPartMappingService> {
|
||||
|
||||
@Autowired
|
||||
private IMesXslEquipPartMappingService mesXslEquipPartMappingService;
|
||||
|
||||
@Operation(summary = "MES设备对应部位-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<MesXslEquipPartMapping>> queryPageList(
|
||||
MesXslEquipPartMapping model,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<MesXslEquipPartMapping> queryWrapper = QueryGenerator.initQueryWrapper(model, req.getParameterMap());
|
||||
//update-begin---author:jiangxh ---date:20250603 for：【MES】设备对应部位列表按设备名称、机台代号、大部位代码排序-----------
|
||||
queryWrapper.orderByAsc("equipment_name", "machine_code", "part_code", "sub_part_code");
|
||||
//update-end---author:jiangxh ---date:20250603 for：【MES】设备对应部位列表按设备名称、机台代号、大部位代码排序-----------
|
||||
Page<MesXslEquipPartMapping> page = new Page<>(pageNo, pageSize);
|
||||
IPage<MesXslEquipPartMapping> pageList = mesXslEquipPartMappingService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
@RequiresPermissions("mes:mes_xsl_equip_part_mapping:exportXls")
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, MesXslEquipPartMapping model) {
|
||||
return super.exportXls(request, model, MesXslEquipPartMapping.class, "MES设备对应部位");
|
||||
}
|
||||
}
|
||||
@@ -24,6 +24,7 @@ import org.jeecg.common.system.query.QueryGenerator;
|
||||
import org.jeecg.common.util.oConvertUtils;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipmentCategory;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslProcessOperation;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslDeleteReferenceService;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslEquipmentCategoryService;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslProcessOperationService;
|
||||
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
||||
@@ -52,6 +53,9 @@ public class MesXslEquipmentCategoryController extends JeecgController<MesXslEqu
|
||||
@Autowired
|
||||
private IMesXslProcessOperationService mesXslProcessOperationService;
|
||||
|
||||
@Autowired
|
||||
private IMesXslDeleteReferenceService mesXslDeleteReferenceService;
|
||||
|
||||
@Operation(summary = "MES设备类别-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<MesXslEquipmentCategory>> queryPageList(
|
||||
@@ -100,6 +104,10 @@ public class MesXslEquipmentCategoryController extends JeecgController<MesXslEqu
|
||||
@RequiresPermissions("mes:mes_xsl_equipment_category:delete")
|
||||
@DeleteMapping(value = "/delete")
|
||||
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
|
||||
String refErr = mesXslDeleteReferenceService.validateEquipmentCategoryDelete(List.of(id));
|
||||
if (refErr != null) {
|
||||
return Result.error(refErr);
|
||||
}
|
||||
mesXslEquipmentCategoryService.removeById(id);
|
||||
return Result.OK("删除成功!");
|
||||
}
|
||||
@@ -109,6 +117,10 @@ public class MesXslEquipmentCategoryController extends JeecgController<MesXslEqu
|
||||
@RequiresPermissions("mes:mes_xsl_equipment_category:deleteBatch")
|
||||
@DeleteMapping(value = "/deleteBatch")
|
||||
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
||||
String refErr = mesXslDeleteReferenceService.validateEquipmentCategoryDelete(Arrays.asList(ids.split(",")));
|
||||
if (refErr != null) {
|
||||
return Result.error(refErr);
|
||||
}
|
||||
mesXslEquipmentCategoryService.removeByIds(Arrays.asList(ids.split(",")));
|
||||
return Result.OK("批量删除成功!");
|
||||
}
|
||||
|
||||
@@ -21,6 +21,7 @@ import org.jeecg.common.system.base.controller.JeecgController;
|
||||
import org.jeecg.common.system.query.QueryGenerator;
|
||||
import org.jeecg.common.util.oConvertUtils;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipmentLedger;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslDeleteReferenceService;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslEquipmentLedgerService;
|
||||
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
||||
import org.jeecgframework.poi.excel.entity.ImportParams;
|
||||
@@ -45,6 +46,9 @@ public class MesXslEquipmentLedgerController extends JeecgController<MesXslEquip
|
||||
@Autowired
|
||||
private IMesXslEquipmentLedgerService mesXslEquipmentLedgerService;
|
||||
|
||||
@Autowired
|
||||
private IMesXslDeleteReferenceService mesXslDeleteReferenceService;
|
||||
|
||||
@Operation(summary = "MES设备台账-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<MesXslEquipmentLedger>> queryPageList(
|
||||
@@ -69,6 +73,9 @@ public class MesXslEquipmentLedgerController extends JeecgController<MesXslEquip
|
||||
return Result.error(err);
|
||||
}
|
||||
//update-end---author:jiangxh ---date:20260518 for：【MES】设备台账保存前校验-----------
|
||||
//update-begin---author:jiangxh ---date:20250602 for：【MES】设备台账新增时系统编号由服务端生成-----------
|
||||
model.setLedgerNo(null);
|
||||
//update-end---author:jiangxh ---date:20250602 for：【MES】设备台账新增时系统编号由服务端生成-----------
|
||||
mesXslEquipmentLedgerService.save(model);
|
||||
return Result.OK("添加成功！");
|
||||
}
|
||||
@@ -93,6 +100,10 @@ public class MesXslEquipmentLedgerController extends JeecgController<MesXslEquip
|
||||
@RequiresPermissions("mes:mes_xsl_equipment_ledger:delete")
|
||||
@DeleteMapping(value = "/delete")
|
||||
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
|
||||
String refErr = mesXslDeleteReferenceService.validateEquipmentLedgerDelete(List.of(id));
|
||||
if (refErr != null) {
|
||||
return Result.error(refErr);
|
||||
}
|
||||
mesXslEquipmentLedgerService.removeById(id);
|
||||
return Result.OK("删除成功!");
|
||||
}
|
||||
@@ -102,6 +113,10 @@ public class MesXslEquipmentLedgerController extends JeecgController<MesXslEquip
|
||||
@RequiresPermissions("mes:mes_xsl_equipment_ledger:deleteBatch")
|
||||
@DeleteMapping(value = "/deleteBatch")
|
||||
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
||||
String refErr = mesXslDeleteReferenceService.validateEquipmentLedgerDelete(Arrays.asList(ids.split(",")));
|
||||
if (refErr != null) {
|
||||
return Result.error(refErr);
|
||||
}
|
||||
mesXslEquipmentLedgerService.removeByIds(Arrays.asList(ids.split(",")));
|
||||
return Result.OK("批量删除成功!");
|
||||
}
|
||||
@@ -131,6 +146,13 @@ public class MesXslEquipmentLedgerController extends JeecgController<MesXslEquip
|
||||
return Result.OK("该值可用！");
|
||||
}
|
||||
|
||||
@Operation(summary = "预览下一系统编号（001起）")
|
||||
@GetMapping(value = "/nextLedgerNo")
|
||||
public Result<String> nextLedgerNo() {
|
||||
MesXslEquipmentLedger ctx = new MesXslEquipmentLedger();
|
||||
return Result.OK(mesXslEquipmentLedgerService.generateNextLedgerNo(ctx));
|
||||
}
|
||||
|
||||
@Operation(summary = "校验设备名称是否重复")
|
||||
@GetMapping(value = "/checkEquipmentName")
|
||||
public Result<String> checkEquipmentName(
|
||||
@@ -225,6 +247,14 @@ public class MesXslEquipmentLedgerController extends JeecgController<MesXslEquip
|
||||
if (mesXslEquipmentLedgerService.isEquipmentCodeDuplicated(code, excludeId, model)) {
|
||||
return "设备编号不能重复";
|
||||
}
|
||||
//update-begin---author:jiangxh ---date:20250602 for：【MES】设备台账设备类别、设备类型必填-----------
|
||||
if (oConvertUtils.isEmpty(model.getEquipmentCategoryId())) {
|
||||
return "请选择设备类别";
|
||||
}
|
||||
if (oConvertUtils.isEmpty(model.getEquipmentTypeId())) {
|
||||
return "请选择设备类型";
|
||||
}
|
||||
//update-end---author:jiangxh ---date:20250602 for：【MES】设备台账设备类别、设备类型必填-----------
|
||||
trimRelationNames(model);
|
||||
String status = model.getEquipmentStatus();
|
||||
if (oConvertUtils.isEmpty(status)) {
|
||||
@@ -258,6 +288,7 @@ public class MesXslEquipmentLedgerController extends JeecgController<MesXslEquip
|
||||
return "文件导入失败：第 " + rowNo + " 条设备编号不能为空";
|
||||
}
|
||||
row.setEquipmentCode(code);
|
||||
row.setLedgerNo(null);
|
||||
if (!codesInFile.add(code)) {
|
||||
return "文件导入失败：设备编号【" + code + "】在导入文件中重复";
|
||||
}
|
||||
@@ -279,6 +310,14 @@ public class MesXslEquipmentLedgerController extends JeecgController<MesXslEquip
|
||||
return "文件导入失败：第 " + rowNo + " 条设备名称【" + name + "】不能重复";
|
||||
}
|
||||
trimRelationNames(row);
|
||||
//update-begin---author:jiangxh ---date:20250602 for：【MES】设备台账导入设备类别、设备类型必填-----------
|
||||
if (oConvertUtils.isEmpty(row.getEquipmentCategoryId()) && oConvertUtils.isEmpty(row.getEquipmentCategoryName())) {
|
||||
return "文件导入失败：第 " + rowNo + " 条设备类别不能为空";
|
||||
}
|
||||
if (oConvertUtils.isEmpty(row.getEquipmentTypeId()) && oConvertUtils.isEmpty(row.getEquipmentTypeName())) {
|
||||
return "文件导入失败：第 " + rowNo + " 条设备类型不能为空";
|
||||
}
|
||||
//update-end---author:jiangxh ---date:20250602 for：【MES】设备台账导入设备类别、设备类型必填-----------
|
||||
String status = row.getEquipmentStatus();
|
||||
if (oConvertUtils.isEmpty(status)) {
|
||||
row.setEquipmentStatus("0");
|
||||
|
||||
@@ -22,6 +22,7 @@ import org.jeecg.common.system.query.QueryGenerator;
|
||||
import org.jeecg.common.util.oConvertUtils;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipmentCategory;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipmentPart;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslDeleteReferenceService;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslEquipmentCategoryService;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslEquipmentPartService;
|
||||
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
||||
@@ -49,6 +50,9 @@ public class MesXslEquipmentPartController extends JeecgController<MesXslEquipme
|
||||
@Autowired
|
||||
private IMesXslEquipmentCategoryService mesXslEquipmentCategoryService;
|
||||
|
||||
@Autowired
|
||||
private IMesXslDeleteReferenceService mesXslDeleteReferenceService;
|
||||
|
||||
@Operation(summary = "MES设备部位-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<MesXslEquipmentPart>> queryPageList(
|
||||
@@ -97,6 +101,10 @@ public class MesXslEquipmentPartController extends JeecgController<MesXslEquipme
|
||||
@RequiresPermissions("mes:mes_xsl_equipment_part:delete")
|
||||
@DeleteMapping(value = "/delete")
|
||||
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
|
||||
String refErr = mesXslDeleteReferenceService.validateEquipmentPartDelete(List.of(id));
|
||||
if (refErr != null) {
|
||||
return Result.error(refErr);
|
||||
}
|
||||
mesXslEquipmentPartService.removeById(id);
|
||||
return Result.OK("删除成功!");
|
||||
}
|
||||
@@ -106,6 +114,10 @@ public class MesXslEquipmentPartController extends JeecgController<MesXslEquipme
|
||||
@RequiresPermissions("mes:mes_xsl_equipment_part:deleteBatch")
|
||||
@DeleteMapping(value = "/deleteBatch")
|
||||
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
||||
String refErr = mesXslDeleteReferenceService.validateEquipmentPartDelete(Arrays.asList(ids.split(",")));
|
||||
if (refErr != null) {
|
||||
return Result.error(refErr);
|
||||
}
|
||||
mesXslEquipmentPartService.removeByIds(Arrays.asList(ids.split(",")));
|
||||
return Result.OK("批量删除成功!");
|
||||
}
|
||||
|
||||
@@ -23,6 +23,7 @@ import org.jeecg.common.util.oConvertUtils;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipmentCategory;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipmentPart;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipmentSubPart;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslDeleteReferenceService;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslEquipmentCategoryService;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslEquipmentPartService;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslEquipmentSubPartService;
|
||||
@@ -54,6 +55,9 @@ public class MesXslEquipmentSubPartController extends JeecgController<MesXslEqui
|
||||
@Autowired
|
||||
private IMesXslEquipmentPartService mesXslEquipmentPartService;
|
||||
|
||||
@Autowired
|
||||
private IMesXslDeleteReferenceService mesXslDeleteReferenceService;
|
||||
|
||||
@Operation(summary = "MES设备小部位-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<MesXslEquipmentSubPart>> queryPageList(
|
||||
@@ -102,6 +106,10 @@ public class MesXslEquipmentSubPartController extends JeecgController<MesXslEqui
|
||||
@RequiresPermissions("mes:mes_xsl_equipment_sub_part:delete")
|
||||
@DeleteMapping(value = "/delete")
|
||||
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
|
||||
String refErr = mesXslDeleteReferenceService.validateEquipmentSubPartDelete(List.of(id));
|
||||
if (refErr != null) {
|
||||
return Result.error(refErr);
|
||||
}
|
||||
mesXslEquipmentSubPartService.removeById(id);
|
||||
return Result.OK("删除成功!");
|
||||
}
|
||||
@@ -111,6 +119,10 @@ public class MesXslEquipmentSubPartController extends JeecgController<MesXslEqui
|
||||
@RequiresPermissions("mes:mes_xsl_equipment_sub_part:deleteBatch")
|
||||
@DeleteMapping(value = "/deleteBatch")
|
||||
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
||||
String refErr = mesXslDeleteReferenceService.validateEquipmentSubPartDelete(Arrays.asList(ids.split(",")));
|
||||
if (refErr != null) {
|
||||
return Result.error(refErr);
|
||||
}
|
||||
mesXslEquipmentSubPartService.removeByIds(Arrays.asList(ids.split(",")));
|
||||
return Result.OK("批量删除成功!");
|
||||
}
|
||||
|
||||
@@ -25,6 +25,7 @@ import org.jeecg.common.util.oConvertUtils;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipmentCategory;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipmentType;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslProcessOperation;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslDeleteReferenceService;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslEquipmentCategoryService;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslEquipmentTypeService;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslProcessOperationService;
|
||||
@@ -54,6 +55,9 @@ public class MesXslEquipmentTypeController extends JeecgController<MesXslEquipme
|
||||
@Autowired
|
||||
private IMesXslEquipmentCategoryService mesXslEquipmentCategoryService;
|
||||
|
||||
@Autowired
|
||||
private IMesXslDeleteReferenceService mesXslDeleteReferenceService;
|
||||
|
||||
@Operation(summary = "MES设备类型-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<MesXslEquipmentType>> queryPageList(
|
||||
@@ -102,6 +106,10 @@ public class MesXslEquipmentTypeController extends JeecgController<MesXslEquipme
|
||||
@RequiresPermissions("mes:mes_xsl_equipment_type:delete")
|
||||
@DeleteMapping(value = "/delete")
|
||||
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
|
||||
String refErr = mesXslDeleteReferenceService.validateEquipmentTypeDelete(List.of(id));
|
||||
if (refErr != null) {
|
||||
return Result.error(refErr);
|
||||
}
|
||||
mesXslEquipmentTypeService.removeById(id);
|
||||
return Result.OK("删除成功!");
|
||||
}
|
||||
@@ -111,6 +119,10 @@ public class MesXslEquipmentTypeController extends JeecgController<MesXslEquipme
|
||||
@RequiresPermissions("mes:mes_xsl_equipment_type:deleteBatch")
|
||||
@DeleteMapping(value = "/deleteBatch")
|
||||
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
||||
String refErr = mesXslDeleteReferenceService.validateEquipmentTypeDelete(Arrays.asList(ids.split(",")));
|
||||
if (refErr != null) {
|
||||
return Result.error(refErr);
|
||||
}
|
||||
mesXslEquipmentTypeService.removeByIds(Arrays.asList(ids.split(",")));
|
||||
return Result.OK("批量删除成功!");
|
||||
}
|
||||
|
||||
@@ -8,6 +8,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
@@ -26,6 +27,7 @@ import org.jeecg.modules.xslmes.service.IMesXslEquipmentCategoryService;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslEquipmentPartService;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslEquipmentSubPartService;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslEquipmentTypeService;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslDeleteReferenceService;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslInspectMaintainItemService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
@@ -60,6 +62,9 @@ public class MesXslInspectMaintainItemController
|
||||
@Autowired
|
||||
private IMesXslEquipmentSubPartService mesXslEquipmentSubPartService;
|
||||
|
||||
@Autowired
|
||||
private IMesXslDeleteReferenceService mesXslDeleteReferenceService;
|
||||
|
||||
@Operation(summary = "MES点检及保养项目-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<MesXslInspectMaintainItem>> queryPageList(
|
||||
@@ -109,6 +114,12 @@ public class MesXslInspectMaintainItemController
|
||||
@RequiresPermissions("mes:mes_xsl_inspect_maintain_item:delete")
|
||||
@DeleteMapping(value = "/delete")
|
||||
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
|
||||
//update-begin---author:jiangxh ---date:20250603 for：【MES】点检及保养项目删除前校验设备点检配置等引用-----------
|
||||
String err = mesXslDeleteReferenceService.validateInspectMaintainItemDelete(List.of(id));
|
||||
if (err != null) {
|
||||
return Result.error(err);
|
||||
}
|
||||
//update-end---author:jiangxh ---date:20250603 for：【MES】点检及保养项目删除前校验设备点检配置等引用-----------
|
||||
mesXslInspectMaintainItemService.removeById(id);
|
||||
return Result.OK("删除成功!");
|
||||
}
|
||||
@@ -118,6 +129,12 @@ public class MesXslInspectMaintainItemController
|
||||
@RequiresPermissions("mes:mes_xsl_inspect_maintain_item:deleteBatch")
|
||||
@DeleteMapping(value = "/deleteBatch")
|
||||
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
||||
//update-begin---author:jiangxh ---date:20250603 for：【MES】点检及保养项目删除前校验设备点检配置等引用-----------
|
||||
String err = mesXslDeleteReferenceService.validateInspectMaintainItemDelete(Arrays.asList(ids.split(",")));
|
||||
if (err != null) {
|
||||
return Result.error(err);
|
||||
}
|
||||
//update-end---author:jiangxh ---date:20250603 for：【MES】点检及保养项目删除前校验设备点检配置等引用-----------
|
||||
mesXslInspectMaintainItemService.removeByIds(Arrays.asList(ids.split(",")));
|
||||
return Result.OK("批量删除成功!");
|
||||
}
|
||||
|
||||
@@ -21,6 +21,7 @@ import org.jeecg.common.system.base.controller.JeecgController;
|
||||
import org.jeecg.common.system.query.QueryGenerator;
|
||||
import org.jeecg.common.util.oConvertUtils;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslManufacturer;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslDeleteReferenceService;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslManufacturerService;
|
||||
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
||||
import org.jeecgframework.poi.excel.entity.ImportParams;
|
||||
@@ -45,6 +46,9 @@ public class MesXslManufacturerController extends JeecgController<MesXslManufact
|
||||
@Autowired
|
||||
private IMesXslManufacturerService mesXslManufacturerService;
|
||||
|
||||
@Autowired
|
||||
private IMesXslDeleteReferenceService mesXslDeleteReferenceService;
|
||||
|
||||
@Operation(summary = "MES厂家信息-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<MesXslManufacturer>> queryPageList(
|
||||
@@ -93,6 +97,10 @@ public class MesXslManufacturerController extends JeecgController<MesXslManufact
|
||||
@RequiresPermissions("mes:mes_xsl_manufacturer:delete")
|
||||
@DeleteMapping(value = "/delete")
|
||||
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
|
||||
String refErr = mesXslDeleteReferenceService.validateManufacturerDelete(List.of(id));
|
||||
if (refErr != null) {
|
||||
return Result.error(refErr);
|
||||
}
|
||||
mesXslManufacturerService.removeById(id);
|
||||
return Result.OK("删除成功!");
|
||||
}
|
||||
@@ -102,6 +110,10 @@ public class MesXslManufacturerController extends JeecgController<MesXslManufact
|
||||
@RequiresPermissions("mes:mes_xsl_manufacturer:deleteBatch")
|
||||
@DeleteMapping(value = "/deleteBatch")
|
||||
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
||||
String refErr = mesXslDeleteReferenceService.validateManufacturerDelete(Arrays.asList(ids.split(",")));
|
||||
if (refErr != null) {
|
||||
return Result.error(refErr);
|
||||
}
|
||||
mesXslManufacturerService.removeByIds(Arrays.asList(ids.split(",")));
|
||||
return Result.OK("批量删除成功!");
|
||||
}
|
||||
|
||||
@@ -25,6 +25,7 @@ import org.jeecg.common.system.query.QueryGenerator;
|
||||
import org.jeecg.common.util.oConvertUtils;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslRubberQuickTestDataPoint;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslRubberQuickTestType;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslDeleteReferenceService;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslRubberQuickTestDataPointService;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslRubberQuickTestTypeService;
|
||||
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
||||
@@ -51,6 +52,9 @@ public class MesXslRubberQuickTestDataPointController
|
||||
@Autowired
|
||||
private IMesXslRubberQuickTestTypeService mesXslRubberQuickTestTypeService;
|
||||
|
||||
@Autowired
|
||||
private IMesXslDeleteReferenceService mesXslDeleteReferenceService;
|
||||
|
||||
@Operation(summary = "MES胶料快检数据点-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<MesXslRubberQuickTestDataPoint>> queryPageList(
|
||||
@@ -120,6 +124,10 @@ public class MesXslRubberQuickTestDataPointController
|
||||
@RequiresPermissions("mes:mes_xsl_rubber_quick_test_data_point:delete")
|
||||
@DeleteMapping(value = "/delete")
|
||||
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
|
||||
String refErr = mesXslDeleteReferenceService.validateRubberQuickTestDataPointDelete(List.of(id));
|
||||
if (refErr != null) {
|
||||
return Result.error(refErr);
|
||||
}
|
||||
mesXslRubberQuickTestDataPointService.removeById(id);
|
||||
return Result.OK("删除成功!");
|
||||
}
|
||||
@@ -129,6 +137,10 @@ public class MesXslRubberQuickTestDataPointController
|
||||
@RequiresPermissions("mes:mes_xsl_rubber_quick_test_data_point:deleteBatch")
|
||||
@DeleteMapping(value = "/deleteBatch")
|
||||
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
||||
String refErr = mesXslDeleteReferenceService.validateRubberQuickTestDataPointDelete(Arrays.asList(ids.split(",")));
|
||||
if (refErr != null) {
|
||||
return Result.error(refErr);
|
||||
}
|
||||
mesXslRubberQuickTestDataPointService.removeByIds(Arrays.asList(ids.split(",")));
|
||||
return Result.OK("批量删除成功!");
|
||||
}
|
||||
|
||||
@@ -50,6 +50,7 @@ import org.jeecg.modules.xslmes.entity.MesXslRubberQuickTestType;
|
||||
|
||||
import org.jeecg.modules.xslmes.service.IMesXslRubberQuickTestDataPointService;
|
||||
|
||||
import org.jeecg.modules.xslmes.service.IMesXslDeleteReferenceService;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslRubberQuickTestMethodService;
|
||||
|
||||
import org.jeecg.modules.xslmes.service.IMesXslRubberQuickTestTypeService;
|
||||
@@ -102,7 +103,8 @@ public class MesXslRubberQuickTestMethodController
|
||||
|
||||
private IMesXslRubberQuickTestDataPointService mesXslRubberQuickTestDataPointService;
|
||||
|
||||
|
||||
@Autowired
|
||||
private IMesXslDeleteReferenceService mesXslDeleteReferenceService;
|
||||
|
||||
@Operation(summary = "MES胶料快检实验方法-分页列表查询")
|
||||
|
||||
@@ -231,29 +233,25 @@ public class MesXslRubberQuickTestMethodController
|
||||
@DeleteMapping(value = "/delete")
|
||||
|
||||
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
|
||||
|
||||
String refErr = mesXslDeleteReferenceService.validateRubberQuickTestMethodDelete(List.of(id));
|
||||
if (refErr != null) {
|
||||
return Result.error(refErr);
|
||||
}
|
||||
mesXslRubberQuickTestMethodService.delMain(id);
|
||||
|
||||
return Result.OK("删除成功!");
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@AutoLog(value = "MES胶料快检实验方法-批量删除")
|
||||
|
||||
@Operation(summary = "MES胶料快检实验方法-批量删除")
|
||||
|
||||
@RequiresPermissions("mes:mes_xsl_rubber_quick_test_method:deleteBatch")
|
||||
|
||||
@DeleteMapping(value = "/deleteBatch")
|
||||
|
||||
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
||||
|
||||
String refErr = mesXslDeleteReferenceService.validateRubberQuickTestMethodDelete(Arrays.asList(ids.split(",")));
|
||||
if (refErr != null) {
|
||||
return Result.error(refErr);
|
||||
}
|
||||
mesXslRubberQuickTestMethodService.delBatchMain(Arrays.asList(ids.split(",")));
|
||||
|
||||
return Result.OK("批量删除成功!");
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -34,6 +34,7 @@ import org.jeecg.modules.xslmes.entity.MesXslRubberQuickTestStd;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslRubberQuickTestStdLine;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslMixerPsCompileService;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslRubberQuickTestMethodService;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslDeleteReferenceService;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslRubberQuickTestStdService;
|
||||
import org.jeecg.modules.xslmes.vo.MesXslRubberQuickTestStdPage;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
@@ -69,6 +70,9 @@ public class MesXslRubberQuickTestStdController
|
||||
@Autowired
|
||||
private ISysDepartService sysDepartService;
|
||||
|
||||
@Autowired
|
||||
private IMesXslDeleteReferenceService mesXslDeleteReferenceService;
|
||||
|
||||
@Operation(summary = "MES胶料快检实验标准-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<MesXslRubberQuickTestStd>> queryPageList(
|
||||
@@ -133,6 +137,10 @@ public class MesXslRubberQuickTestStdController
|
||||
@RequiresPermissions("mes:mes_xsl_rubber_quick_test_std:delete")
|
||||
@DeleteMapping(value = "/delete")
|
||||
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
|
||||
String refErr = mesXslDeleteReferenceService.validateRubberQuickTestStdDelete(List.of(id));
|
||||
if (refErr != null) {
|
||||
return Result.error(refErr);
|
||||
}
|
||||
mesXslRubberQuickTestStdService.delMain(id);
|
||||
return Result.OK("删除成功!");
|
||||
}
|
||||
@@ -142,6 +150,10 @@ public class MesXslRubberQuickTestStdController
|
||||
@RequiresPermissions("mes:mes_xsl_rubber_quick_test_std:deleteBatch")
|
||||
@DeleteMapping(value = "/deleteBatch")
|
||||
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
||||
String refErr = mesXslDeleteReferenceService.validateRubberQuickTestStdDelete(Arrays.asList(ids.split(",")));
|
||||
if (refErr != null) {
|
||||
return Result.error(refErr);
|
||||
}
|
||||
mesXslRubberQuickTestStdService.delBatchMain(Arrays.asList(ids.split(",")));
|
||||
return Result.OK("批量删除成功!");
|
||||
}
|
||||
|
||||
@@ -22,6 +22,7 @@ import org.jeecg.common.system.query.QueryGenerator;
|
||||
import org.jeecg.common.exception.JeecgBootException;
|
||||
import org.jeecg.common.util.oConvertUtils;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslRubberQuickTestType;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslDeleteReferenceService;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslRubberQuickTestTypeService;
|
||||
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
||||
import org.jeecgframework.poi.excel.entity.ImportParams;
|
||||
@@ -44,6 +45,9 @@ public class MesXslRubberQuickTestTypeController
|
||||
@Autowired
|
||||
private IMesXslRubberQuickTestTypeService mesXslRubberQuickTestTypeService;
|
||||
|
||||
@Autowired
|
||||
private IMesXslDeleteReferenceService mesXslDeleteReferenceService;
|
||||
|
||||
@Operation(summary = "MES胶料快检实验类型-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<MesXslRubberQuickTestType>> queryPageList(
|
||||
@@ -116,6 +120,10 @@ public class MesXslRubberQuickTestTypeController
|
||||
@RequiresPermissions("mes:mes_xsl_rubber_quick_test_type:delete")
|
||||
@DeleteMapping(value = "/delete")
|
||||
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
|
||||
String refErr = mesXslDeleteReferenceService.validateRubberQuickTestTypeDelete(List.of(id));
|
||||
if (refErr != null) {
|
||||
return Result.error(refErr);
|
||||
}
|
||||
mesXslRubberQuickTestTypeService.removeById(id);
|
||||
return Result.OK("删除成功!");
|
||||
}
|
||||
@@ -125,6 +133,10 @@ public class MesXslRubberQuickTestTypeController
|
||||
@RequiresPermissions("mes:mes_xsl_rubber_quick_test_type:deleteBatch")
|
||||
@DeleteMapping(value = "/deleteBatch")
|
||||
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
||||
String refErr = mesXslDeleteReferenceService.validateRubberQuickTestTypeDelete(Arrays.asList(ids.split(",")));
|
||||
if (refErr != null) {
|
||||
return Result.error(refErr);
|
||||
}
|
||||
mesXslRubberQuickTestTypeService.removeByIds(Arrays.asList(ids.split(",")));
|
||||
return Result.OK("批量删除成功!");
|
||||
}
|
||||
|
||||
@@ -22,6 +22,7 @@ import org.jeecg.common.system.query.QueryGenerator;
|
||||
import org.jeecg.common.constant.CommonConstant;
|
||||
import org.jeecg.common.util.oConvertUtils;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslRubberSmallLockReason;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslDeleteReferenceService;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslRubberSmallLockReasonService;
|
||||
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
||||
import org.jeecgframework.poi.excel.entity.ImportParams;
|
||||
@@ -44,6 +45,9 @@ public class MesXslRubberSmallLockReasonController
|
||||
@Autowired
|
||||
private IMesXslRubberSmallLockReasonService mesXslRubberSmallLockReasonService;
|
||||
|
||||
@Autowired
|
||||
private IMesXslDeleteReferenceService mesXslDeleteReferenceService;
|
||||
|
||||
@Operation(summary = "MES胶料小料锁定原因-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<MesXslRubberSmallLockReason>> queryPageList(
|
||||
@@ -122,6 +126,10 @@ public class MesXslRubberSmallLockReasonController
|
||||
@RequiresPermissions("mes:mes_xsl_rubber_small_lock_reason:delete")
|
||||
@DeleteMapping(value = "/delete")
|
||||
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
|
||||
String refErr = mesXslDeleteReferenceService.validateRubberSmallLockReasonDelete(List.of(id));
|
||||
if (refErr != null) {
|
||||
return Result.error(refErr);
|
||||
}
|
||||
mesXslRubberSmallLockReasonService.removeById(id);
|
||||
return Result.OK("删除成功!");
|
||||
}
|
||||
@@ -131,6 +139,10 @@ public class MesXslRubberSmallLockReasonController
|
||||
@RequiresPermissions("mes:mes_xsl_rubber_small_lock_reason:deleteBatch")
|
||||
@DeleteMapping(value = "/deleteBatch")
|
||||
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
||||
String refErr = mesXslDeleteReferenceService.validateRubberSmallLockReasonDelete(Arrays.asList(ids.split(",")));
|
||||
if (refErr != null) {
|
||||
return Result.error(refErr);
|
||||
}
|
||||
mesXslRubberSmallLockReasonService.removeByIds(Arrays.asList(ids.split(",")));
|
||||
return Result.OK("批量删除成功!");
|
||||
}
|
||||
|
||||
@@ -21,6 +21,7 @@ import org.jeecg.common.system.base.controller.JeecgController;
|
||||
import org.jeecg.common.system.query.QueryGenerator;
|
||||
import org.jeecg.common.util.oConvertUtils;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslSparePartsCategory;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslDeleteReferenceService;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslSparePartsCategoryService;
|
||||
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
||||
import org.jeecgframework.poi.excel.entity.ImportParams;
|
||||
@@ -42,6 +43,9 @@ public class MesXslSparePartsCategoryController extends JeecgController<MesXslSp
|
||||
@Autowired
|
||||
private IMesXslSparePartsCategoryService mesXslSparePartsCategoryService;
|
||||
|
||||
@Autowired
|
||||
private IMesXslDeleteReferenceService mesXslDeleteReferenceService;
|
||||
|
||||
@Operation(summary = "MES备品件类别-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<MesXslSparePartsCategory>> queryPageList(
|
||||
@@ -90,6 +94,10 @@ public class MesXslSparePartsCategoryController extends JeecgController<MesXslSp
|
||||
@RequiresPermissions("mes:mes_xsl_spare_parts_category:delete")
|
||||
@DeleteMapping(value = "/delete")
|
||||
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
|
||||
String refErr = mesXslDeleteReferenceService.validateSparePartsCategoryDelete(List.of(id));
|
||||
if (refErr != null) {
|
||||
return Result.error(refErr);
|
||||
}
|
||||
mesXslSparePartsCategoryService.removeById(id);
|
||||
return Result.OK("删除成功!");
|
||||
}
|
||||
@@ -99,6 +107,10 @@ public class MesXslSparePartsCategoryController extends JeecgController<MesXslSp
|
||||
@RequiresPermissions("mes:mes_xsl_spare_parts_category:deleteBatch")
|
||||
@DeleteMapping(value = "/deleteBatch")
|
||||
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
||||
String refErr = mesXslDeleteReferenceService.validateSparePartsCategoryDelete(Arrays.asList(ids.split(",")));
|
||||
if (refErr != null) {
|
||||
return Result.error(refErr);
|
||||
}
|
||||
mesXslSparePartsCategoryService.removeByIds(Arrays.asList(ids.split(",")));
|
||||
return Result.OK("批量删除成功!");
|
||||
}
|
||||
|
||||
@@ -0,0 +1,75 @@
|
||||
package org.jeecg.modules.xslmes.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
/**
|
||||
* MES 设备对应部位（表 mes_xsl_equip_part_mapping，由设备点检配置保存后自动生成）
|
||||
*/
|
||||
@Data
|
||||
@TableName("mes_xsl_equip_part_mapping")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@Schema(description = "MES设备对应部位")
|
||||
public class MesXslEquipPartMapping implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
private String id;
|
||||
|
||||
@Schema(description = "设备台账主键 mes_xsl_equipment_ledger.id")
|
||||
private String equipmentLedgerId;
|
||||
|
||||
@Excel(name = "设备名称", width = 22)
|
||||
@Schema(description = "设备名称")
|
||||
private String equipmentName;
|
||||
|
||||
@Excel(name = "机台代号", width = 18)
|
||||
@Schema(description = "机台代号（设备编号冗余）")
|
||||
private String machineCode;
|
||||
|
||||
@Schema(description = "设备大部位主键 mes_xsl_equipment_part.id")
|
||||
private String equipmentPartId;
|
||||
|
||||
@Excel(name = "设备大部位", width = 20)
|
||||
@Schema(description = "设备大部位名称")
|
||||
private String equipmentPartName;
|
||||
|
||||
@Excel(name = "大部位代码", width = 16)
|
||||
@Schema(description = "大部位代码")
|
||||
private String partCode;
|
||||
|
||||
@Schema(description = "设备小部位主键 mes_xsl_equipment_sub_part.id")
|
||||
private String equipmentSubPartId;
|
||||
|
||||
@Excel(name = "设备小部位", width = 20)
|
||||
@Schema(description = "设备小部位名称")
|
||||
private String equipmentSubPartName;
|
||||
|
||||
@Excel(name = "小部位代码", width = 16)
|
||||
@Schema(description = "小部位代码")
|
||||
private String subPartCode;
|
||||
|
||||
private Integer tenantId;
|
||||
private String sysOrgCode;
|
||||
private String createBy;
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date createTime;
|
||||
private String updateBy;
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date updateTime;
|
||||
private Integer delFlag;
|
||||
}
|
||||
@@ -40,6 +40,10 @@ public class MesXslEquipmentLedger implements Serializable {
|
||||
@Schema(description = "设备名称（同租户未删除数据中唯一）")
|
||||
private String equipmentName;
|
||||
|
||||
@Excel(name = "系统编号", width = 12)
|
||||
@Schema(description = "系统编号（租户内从001递增自动生成，只读）")
|
||||
private String ledgerNo;
|
||||
|
||||
@Excel(name = "设备编号", width = 18)
|
||||
@Schema(description = "设备编号（同租户未删除数据中唯一）")
|
||||
private String equipmentCode;
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
package org.jeecg.modules.xslmes.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipPartMapping;
|
||||
|
||||
public interface MesXslEquipPartMappingMapper extends BaseMapper<MesXslEquipPartMapping> {}
|
||||
@@ -1,6 +1,17 @@
|
||||
package org.jeecg.modules.xslmes.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.apache.ibatis.annotations.Select;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipmentLedger;
|
||||
|
||||
public interface MesXslEquipmentLedgerMapper extends BaseMapper<MesXslEquipmentLedger> {}
|
||||
public interface MesXslEquipmentLedgerMapper extends BaseMapper<MesXslEquipmentLedger> {
|
||||
|
||||
//update-begin---author:jiangxh ---date:20250602 for：【MES】设备台账租户内最大三位系统编号-----------
|
||||
@Select(
|
||||
"SELECT IFNULL(MAX(CAST(ledger_no AS UNSIGNED)), 0) FROM mes_xsl_equipment_ledger "
|
||||
+ "WHERE del_flag = 0 AND ledger_no REGEXP '^[0-9]+$' "
|
||||
+ "AND (#{tenantId} IS NULL OR tenant_id = #{tenantId})")
|
||||
Integer selectMaxNumericLedgerNo(@Param("tenantId") Integer tenantId);
|
||||
//update-end---author:jiangxh ---date:20250602 for：【MES】设备台账租户内最大三位系统编号-----------
|
||||
}
|
||||
|
||||
@@ -0,0 +1,77 @@
|
||||
package org.jeecg.modules.xslmes.mcs.controller;
|
||||
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import org.jeecg.common.api.vo.Result;
|
||||
import org.jeecg.modules.xslmes.mcs.util.McsQueryHelper;
|
||||
import org.jeecg.modules.xslmes.mcs.entity.McsToMesAlarm;
|
||||
import org.jeecg.modules.xslmes.mcs.service.IMcsToMesAlarmService;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.jeecg.common.system.base.controller.JeecgController;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
|
||||
/**
|
||||
* @Description: 上辅机报警记录
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Tag(name = "上辅机报警记录")
|
||||
@RestController
|
||||
@RequestMapping("/xslmes/mcs/mcsToMesAlarm")
|
||||
@Slf4j
|
||||
public class McsToMesAlarmController extends JeecgController<McsToMesAlarm, IMcsToMesAlarmService> {
|
||||
|
||||
@Autowired
|
||||
private IMcsToMesAlarmService mcsToMesAlarmService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*/
|
||||
@Operation(summary = "上辅机报警记录-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<McsToMesAlarm>> queryPageList(McsToMesAlarm mcsToMesAlarm,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<McsToMesAlarm> queryWrapper = McsQueryHelper.buildWrapper(mcsToMesAlarm, req.getParameterMap());
|
||||
Page<McsToMesAlarm> page = new Page<>(pageNo, pageSize);
|
||||
IPage<McsToMesAlarm> pageList = mcsToMesAlarmService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*/
|
||||
@Operation(summary = "上辅机报警记录-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<McsToMesAlarm> queryById(@RequestParam(name = "id", required = true) String id) {
|
||||
McsToMesAlarm entity = mcsToMesAlarmService.getById(id);
|
||||
if (entity == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(entity);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出Excel
|
||||
*/
|
||||
@RequiresPermissions("xslmes:mcsToMesAlarm:exportXls")
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, McsToMesAlarm mcsToMesAlarm) {
|
||||
return super.exportXls(request, mcsToMesAlarm, McsToMesAlarm.class, "上辅机报警记录");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,77 @@
|
||||
package org.jeecg.modules.xslmes.mcs.controller;
|
||||
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import org.jeecg.common.api.vo.Result;
|
||||
import org.jeecg.modules.xslmes.mcs.util.McsQueryHelper;
|
||||
import org.jeecg.modules.xslmes.mcs.entity.McsToMesAutoXlLog;
|
||||
import org.jeecg.modules.xslmes.mcs.service.IMcsToMesAutoXlLogService;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.jeecg.common.system.base.controller.JeecgController;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
|
||||
/**
|
||||
* @Description: 自动卸料日志
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Tag(name = "自动卸料日志")
|
||||
@RestController
|
||||
@RequestMapping("/xslmes/mcs/mcsToMesAutoXlLog")
|
||||
@Slf4j
|
||||
public class McsToMesAutoXlLogController extends JeecgController<McsToMesAutoXlLog, IMcsToMesAutoXlLogService> {
|
||||
|
||||
@Autowired
|
||||
private IMcsToMesAutoXlLogService mcsToMesAutoXlLogService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*/
|
||||
@Operation(summary = "自动卸料日志-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<McsToMesAutoXlLog>> queryPageList(McsToMesAutoXlLog mcsToMesAutoXlLog,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<McsToMesAutoXlLog> queryWrapper = McsQueryHelper.buildWrapper(mcsToMesAutoXlLog, req.getParameterMap());
|
||||
Page<McsToMesAutoXlLog> page = new Page<>(pageNo, pageSize);
|
||||
IPage<McsToMesAutoXlLog> pageList = mcsToMesAutoXlLogService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*/
|
||||
@Operation(summary = "自动卸料日志-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<McsToMesAutoXlLog> queryById(@RequestParam(name = "id", required = true) String id) {
|
||||
McsToMesAutoXlLog entity = mcsToMesAutoXlLogService.getById(id);
|
||||
if (entity == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(entity);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出Excel
|
||||
*/
|
||||
@RequiresPermissions("xslmes:mcsToMesAutoXlLog:exportXls")
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, McsToMesAutoXlLog mcsToMesAutoXlLog) {
|
||||
return super.exportXls(request, mcsToMesAutoXlLog, McsToMesAutoXlLog.class, "自动卸料日志");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,77 @@
|
||||
package org.jeecg.modules.xslmes.mcs.controller;
|
||||
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import org.jeecg.common.api.vo.Result;
|
||||
import org.jeecg.modules.xslmes.mcs.util.McsQueryHelper;
|
||||
import org.jeecg.modules.xslmes.mcs.entity.McsToMesBinToMater;
|
||||
import org.jeecg.modules.xslmes.mcs.service.IMcsToMesBinToMaterService;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.jeecg.common.system.base.controller.JeecgController;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
|
||||
/**
|
||||
* @Description: 料仓物料对应
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Tag(name = "料仓物料对应")
|
||||
@RestController
|
||||
@RequestMapping("/xslmes/mcs/mcsToMesBinToMater")
|
||||
@Slf4j
|
||||
public class McsToMesBinToMaterController extends JeecgController<McsToMesBinToMater, IMcsToMesBinToMaterService> {
|
||||
|
||||
@Autowired
|
||||
private IMcsToMesBinToMaterService mcsToMesBinToMaterService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*/
|
||||
@Operation(summary = "料仓物料对应-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<McsToMesBinToMater>> queryPageList(McsToMesBinToMater mcsToMesBinToMater,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<McsToMesBinToMater> queryWrapper = McsQueryHelper.buildWrapper(mcsToMesBinToMater, req.getParameterMap());
|
||||
Page<McsToMesBinToMater> page = new Page<>(pageNo, pageSize);
|
||||
IPage<McsToMesBinToMater> pageList = mcsToMesBinToMaterService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*/
|
||||
@Operation(summary = "料仓物料对应-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<McsToMesBinToMater> queryById(@RequestParam(name = "id", required = true) String id) {
|
||||
McsToMesBinToMater entity = mcsToMesBinToMaterService.getById(id);
|
||||
if (entity == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(entity);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出Excel
|
||||
*/
|
||||
@RequiresPermissions("xslmes:mcsToMesBinToMater:exportXls")
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, McsToMesBinToMater mcsToMesBinToMater) {
|
||||
return super.exportXls(request, mcsToMesBinToMater, McsToMesBinToMater.class, "料仓物料对应");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,77 @@
|
||||
package org.jeecg.modules.xslmes.mcs.controller;
|
||||
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import org.jeecg.common.api.vo.Result;
|
||||
import org.jeecg.modules.xslmes.mcs.util.McsQueryHelper;
|
||||
import org.jeecg.modules.xslmes.mcs.entity.McsToMesCheckScaleLog;
|
||||
import org.jeecg.modules.xslmes.mcs.service.IMcsToMesCheckScaleLogService;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.jeecg.common.system.base.controller.JeecgController;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
|
||||
/**
|
||||
* @Description: 称量校验日志
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Tag(name = "称量校验日志")
|
||||
@RestController
|
||||
@RequestMapping("/xslmes/mcs/mcsToMesCheckScaleLog")
|
||||
@Slf4j
|
||||
public class McsToMesCheckScaleLogController extends JeecgController<McsToMesCheckScaleLog, IMcsToMesCheckScaleLogService> {
|
||||
|
||||
@Autowired
|
||||
private IMcsToMesCheckScaleLogService mcsToMesCheckScaleLogService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*/
|
||||
@Operation(summary = "称量校验日志-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<McsToMesCheckScaleLog>> queryPageList(McsToMesCheckScaleLog mcsToMesCheckScaleLog,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<McsToMesCheckScaleLog> queryWrapper = McsQueryHelper.buildWrapper(mcsToMesCheckScaleLog, req.getParameterMap());
|
||||
Page<McsToMesCheckScaleLog> page = new Page<>(pageNo, pageSize);
|
||||
IPage<McsToMesCheckScaleLog> pageList = mcsToMesCheckScaleLogService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*/
|
||||
@Operation(summary = "称量校验日志-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<McsToMesCheckScaleLog> queryById(@RequestParam(name = "id", required = true) String id) {
|
||||
McsToMesCheckScaleLog entity = mcsToMesCheckScaleLogService.getById(id);
|
||||
if (entity == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(entity);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出Excel
|
||||
*/
|
||||
@RequiresPermissions("xslmes:mcsToMesCheckScaleLog:exportXls")
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, McsToMesCheckScaleLog mcsToMesCheckScaleLog) {
|
||||
return super.exportXls(request, mcsToMesCheckScaleLog, McsToMesCheckScaleLog.class, "称量校验日志");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,77 @@
|
||||
package org.jeecg.modules.xslmes.mcs.controller;
|
||||
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import org.jeecg.common.api.vo.Result;
|
||||
import org.jeecg.modules.xslmes.mcs.util.McsQueryHelper;
|
||||
import org.jeecg.modules.xslmes.mcs.entity.McsToMesMixAct;
|
||||
import org.jeecg.modules.xslmes.mcs.service.IMcsToMesMixActService;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.jeecg.common.system.base.controller.JeecgController;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
|
||||
/**
|
||||
* @Description: 密炼机动作状态
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Tag(name = "密炼机动作状态")
|
||||
@RestController
|
||||
@RequestMapping("/xslmes/mcs/mcsToMesMixAct")
|
||||
@Slf4j
|
||||
public class McsToMesMixActController extends JeecgController<McsToMesMixAct, IMcsToMesMixActService> {
|
||||
|
||||
@Autowired
|
||||
private IMcsToMesMixActService mcsToMesMixActService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*/
|
||||
@Operation(summary = "密炼机动作状态-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<McsToMesMixAct>> queryPageList(McsToMesMixAct mcsToMesMixAct,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<McsToMesMixAct> queryWrapper = McsQueryHelper.buildWrapper(mcsToMesMixAct, req.getParameterMap());
|
||||
Page<McsToMesMixAct> page = new Page<>(pageNo, pageSize);
|
||||
IPage<McsToMesMixAct> pageList = mcsToMesMixActService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*/
|
||||
@Operation(summary = "密炼机动作状态-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<McsToMesMixAct> queryById(@RequestParam(name = "id", required = true) String id) {
|
||||
McsToMesMixAct entity = mcsToMesMixActService.getById(id);
|
||||
if (entity == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(entity);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出Excel
|
||||
*/
|
||||
@RequiresPermissions("xslmes:mcsToMesMixAct:exportXls")
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, McsToMesMixAct mcsToMesMixAct) {
|
||||
return super.exportXls(request, mcsToMesMixAct, McsToMesMixAct.class, "密炼机动作状态");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,77 @@
|
||||
package org.jeecg.modules.xslmes.mcs.controller;
|
||||
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import org.jeecg.common.api.vo.Result;
|
||||
import org.jeecg.modules.xslmes.mcs.util.McsQueryHelper;
|
||||
import org.jeecg.modules.xslmes.mcs.entity.McsToMesMixAlarm;
|
||||
import org.jeecg.modules.xslmes.mcs.service.IMcsToMesMixAlarmService;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.jeecg.common.system.base.controller.JeecgController;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
|
||||
/**
|
||||
* @Description: 密炼机报警记录
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Tag(name = "密炼机报警记录")
|
||||
@RestController
|
||||
@RequestMapping("/xslmes/mcs/mcsToMesMixAlarm")
|
||||
@Slf4j
|
||||
public class McsToMesMixAlarmController extends JeecgController<McsToMesMixAlarm, IMcsToMesMixAlarmService> {
|
||||
|
||||
@Autowired
|
||||
private IMcsToMesMixAlarmService mcsToMesMixAlarmService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*/
|
||||
@Operation(summary = "密炼机报警记录-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<McsToMesMixAlarm>> queryPageList(McsToMesMixAlarm mcsToMesMixAlarm,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<McsToMesMixAlarm> queryWrapper = McsQueryHelper.buildWrapper(mcsToMesMixAlarm, req.getParameterMap());
|
||||
Page<McsToMesMixAlarm> page = new Page<>(pageNo, pageSize);
|
||||
IPage<McsToMesMixAlarm> pageList = mcsToMesMixAlarmService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*/
|
||||
@Operation(summary = "密炼机报警记录-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<McsToMesMixAlarm> queryById(@RequestParam(name = "id", required = true) String id) {
|
||||
McsToMesMixAlarm entity = mcsToMesMixAlarmService.getById(id);
|
||||
if (entity == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(entity);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出Excel
|
||||
*/
|
||||
@RequiresPermissions("xslmes:mcsToMesMixAlarm:exportXls")
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, McsToMesMixAlarm mcsToMesMixAlarm) {
|
||||
return super.exportXls(request, mcsToMesMixAlarm, McsToMesMixAlarm.class, "密炼机报警记录");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,77 @@
|
||||
package org.jeecg.modules.xslmes.mcs.controller;
|
||||
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import org.jeecg.common.api.vo.Result;
|
||||
import org.jeecg.modules.xslmes.mcs.util.McsQueryHelper;
|
||||
import org.jeecg.modules.xslmes.mcs.entity.McsToMesMixBatch;
|
||||
import org.jeecg.modules.xslmes.mcs.service.IMcsToMesMixBatchService;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.jeecg.common.system.base.controller.JeecgController;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
|
||||
/**
|
||||
* @Description: 密炼批次数据
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Tag(name = "密炼批次数据")
|
||||
@RestController
|
||||
@RequestMapping("/xslmes/mcs/mcsToMesMixBatch")
|
||||
@Slf4j
|
||||
public class McsToMesMixBatchController extends JeecgController<McsToMesMixBatch, IMcsToMesMixBatchService> {
|
||||
|
||||
@Autowired
|
||||
private IMcsToMesMixBatchService mcsToMesMixBatchService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*/
|
||||
@Operation(summary = "密炼批次数据-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<McsToMesMixBatch>> queryPageList(McsToMesMixBatch mcsToMesMixBatch,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<McsToMesMixBatch> queryWrapper = McsQueryHelper.buildWrapper(mcsToMesMixBatch, req.getParameterMap());
|
||||
Page<McsToMesMixBatch> page = new Page<>(pageNo, pageSize);
|
||||
IPage<McsToMesMixBatch> pageList = mcsToMesMixBatchService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*/
|
||||
@Operation(summary = "密炼批次数据-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<McsToMesMixBatch> queryById(@RequestParam(name = "id", required = true) String id) {
|
||||
McsToMesMixBatch entity = mcsToMesMixBatchService.getById(id);
|
||||
if (entity == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(entity);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出Excel
|
||||
*/
|
||||
@RequiresPermissions("xslmes:mcsToMesMixBatch:exportXls")
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, McsToMesMixBatch mcsToMesMixBatch) {
|
||||
return super.exportXls(request, mcsToMesMixBatch, McsToMesMixBatch.class, "密炼批次数据");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,77 @@
|
||||
package org.jeecg.modules.xslmes.mcs.controller;
|
||||
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import org.jeecg.common.api.vo.Result;
|
||||
import org.jeecg.modules.xslmes.mcs.util.McsQueryHelper;
|
||||
import org.jeecg.modules.xslmes.mcs.entity.McsToMesMixCon;
|
||||
import org.jeecg.modules.xslmes.mcs.service.IMcsToMesMixConService;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.jeecg.common.system.base.controller.JeecgController;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
|
||||
/**
|
||||
* @Description: 密炼机控制参数
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Tag(name = "密炼机控制参数")
|
||||
@RestController
|
||||
@RequestMapping("/xslmes/mcs/mcsToMesMixCon")
|
||||
@Slf4j
|
||||
public class McsToMesMixConController extends JeecgController<McsToMesMixCon, IMcsToMesMixConService> {
|
||||
|
||||
@Autowired
|
||||
private IMcsToMesMixConService mcsToMesMixConService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*/
|
||||
@Operation(summary = "密炼机控制参数-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<McsToMesMixCon>> queryPageList(McsToMesMixCon mcsToMesMixCon,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<McsToMesMixCon> queryWrapper = McsQueryHelper.buildWrapper(mcsToMesMixCon, req.getParameterMap());
|
||||
Page<McsToMesMixCon> page = new Page<>(pageNo, pageSize);
|
||||
IPage<McsToMesMixCon> pageList = mcsToMesMixConService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*/
|
||||
@Operation(summary = "密炼机控制参数-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<McsToMesMixCon> queryById(@RequestParam(name = "id", required = true) String id) {
|
||||
McsToMesMixCon entity = mcsToMesMixConService.getById(id);
|
||||
if (entity == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(entity);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出Excel
|
||||
*/
|
||||
@RequiresPermissions("xslmes:mcsToMesMixCon:exportXls")
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, McsToMesMixCon mcsToMesMixCon) {
|
||||
return super.exportXls(request, mcsToMesMixCon, McsToMesMixCon.class, "密炼机控制参数");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,77 @@
|
||||
package org.jeecg.modules.xslmes.mcs.controller;
|
||||
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import org.jeecg.common.api.vo.Result;
|
||||
import org.jeecg.modules.xslmes.mcs.util.McsQueryHelper;
|
||||
import org.jeecg.modules.xslmes.mcs.entity.McsToMesMixCurve;
|
||||
import org.jeecg.modules.xslmes.mcs.service.IMcsToMesMixCurveService;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.jeecg.common.system.base.controller.JeecgController;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
|
||||
/**
|
||||
* @Description: 密炼过程曲线
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Tag(name = "密炼过程曲线")
|
||||
@RestController
|
||||
@RequestMapping("/xslmes/mcs/mcsToMesMixCurve")
|
||||
@Slf4j
|
||||
public class McsToMesMixCurveController extends JeecgController<McsToMesMixCurve, IMcsToMesMixCurveService> {
|
||||
|
||||
@Autowired
|
||||
private IMcsToMesMixCurveService mcsToMesMixCurveService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*/
|
||||
@Operation(summary = "密炼过程曲线-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<McsToMesMixCurve>> queryPageList(McsToMesMixCurve mcsToMesMixCurve,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<McsToMesMixCurve> queryWrapper = McsQueryHelper.buildWrapper(mcsToMesMixCurve, req.getParameterMap());
|
||||
Page<McsToMesMixCurve> page = new Page<>(pageNo, pageSize);
|
||||
IPage<McsToMesMixCurve> pageList = mcsToMesMixCurveService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*/
|
||||
@Operation(summary = "密炼过程曲线-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<McsToMesMixCurve> queryById(@RequestParam(name = "id", required = true) String id) {
|
||||
McsToMesMixCurve entity = mcsToMesMixCurveService.getById(id);
|
||||
if (entity == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(entity);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出Excel
|
||||
*/
|
||||
@RequiresPermissions("xslmes:mcsToMesMixCurve:exportXls")
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, McsToMesMixCurve mcsToMesMixCurve) {
|
||||
return super.exportXls(request, mcsToMesMixCurve, McsToMesMixCurve.class, "密炼过程曲线");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,77 @@
|
||||
package org.jeecg.modules.xslmes.mcs.controller;
|
||||
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import org.jeecg.common.api.vo.Result;
|
||||
import org.jeecg.modules.xslmes.mcs.util.McsQueryHelper;
|
||||
import org.jeecg.modules.xslmes.mcs.entity.McsToMesMixExePlan;
|
||||
import org.jeecg.modules.xslmes.mcs.service.IMcsToMesMixExePlanService;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.jeecg.common.system.base.controller.JeecgController;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
|
||||
/**
|
||||
* @Description: 密炼执行计划
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Tag(name = "密炼执行计划")
|
||||
@RestController
|
||||
@RequestMapping("/xslmes/mcs/mcsToMesMixExePlan")
|
||||
@Slf4j
|
||||
public class McsToMesMixExePlanController extends JeecgController<McsToMesMixExePlan, IMcsToMesMixExePlanService> {
|
||||
|
||||
@Autowired
|
||||
private IMcsToMesMixExePlanService mcsToMesMixExePlanService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*/
|
||||
@Operation(summary = "密炼执行计划-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<McsToMesMixExePlan>> queryPageList(McsToMesMixExePlan mcsToMesMixExePlan,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<McsToMesMixExePlan> queryWrapper = McsQueryHelper.buildWrapper(mcsToMesMixExePlan, req.getParameterMap());
|
||||
Page<McsToMesMixExePlan> page = new Page<>(pageNo, pageSize);
|
||||
IPage<McsToMesMixExePlan> pageList = mcsToMesMixExePlanService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*/
|
||||
@Operation(summary = "密炼执行计划-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<McsToMesMixExePlan> queryById(@RequestParam(name = "id", required = true) String id) {
|
||||
McsToMesMixExePlan entity = mcsToMesMixExePlanService.getById(id);
|
||||
if (entity == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(entity);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出Excel
|
||||
*/
|
||||
@RequiresPermissions("xslmes:mcsToMesMixExePlan:exportXls")
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, McsToMesMixExePlan mcsToMesMixExePlan) {
|
||||
return super.exportXls(request, mcsToMesMixExePlan, McsToMesMixExePlan.class, "密炼执行计划");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,77 @@
|
||||
package org.jeecg.modules.xslmes.mcs.controller;
|
||||
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import org.jeecg.common.api.vo.Result;
|
||||
import org.jeecg.modules.xslmes.mcs.util.McsQueryHelper;
|
||||
import org.jeecg.modules.xslmes.mcs.entity.McsToMesMixStep;
|
||||
import org.jeecg.modules.xslmes.mcs.service.IMcsToMesMixStepService;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.jeecg.common.system.base.controller.JeecgController;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
|
||||
/**
|
||||
* @Description: 密炼步序数据
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Tag(name = "密炼步序数据")
|
||||
@RestController
|
||||
@RequestMapping("/xslmes/mcs/mcsToMesMixStep")
|
||||
@Slf4j
|
||||
public class McsToMesMixStepController extends JeecgController<McsToMesMixStep, IMcsToMesMixStepService> {
|
||||
|
||||
@Autowired
|
||||
private IMcsToMesMixStepService mcsToMesMixStepService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*/
|
||||
@Operation(summary = "密炼步序数据-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<McsToMesMixStep>> queryPageList(McsToMesMixStep mcsToMesMixStep,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<McsToMesMixStep> queryWrapper = McsQueryHelper.buildWrapper(mcsToMesMixStep, req.getParameterMap());
|
||||
Page<McsToMesMixStep> page = new Page<>(pageNo, pageSize);
|
||||
IPage<McsToMesMixStep> pageList = mcsToMesMixStepService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*/
|
||||
@Operation(summary = "密炼步序数据-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<McsToMesMixStep> queryById(@RequestParam(name = "id", required = true) String id) {
|
||||
McsToMesMixStep entity = mcsToMesMixStepService.getById(id);
|
||||
if (entity == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(entity);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出Excel
|
||||
*/
|
||||
@RequiresPermissions("xslmes:mcsToMesMixStep:exportXls")
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, McsToMesMixStep mcsToMesMixStep) {
|
||||
return super.exportXls(request, mcsToMesMixStep, McsToMesMixStep.class, "密炼步序数据");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,77 @@
|
||||
package org.jeecg.modules.xslmes.mcs.controller;
|
||||
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import org.jeecg.common.api.vo.Result;
|
||||
import org.jeecg.modules.xslmes.mcs.util.McsQueryHelper;
|
||||
import org.jeecg.modules.xslmes.mcs.entity.McsToMesMixWeight;
|
||||
import org.jeecg.modules.xslmes.mcs.service.IMcsToMesMixWeightService;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.jeecg.common.system.base.controller.JeecgController;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
|
||||
/**
|
||||
* @Description: 密炼物料称量
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Tag(name = "密炼物料称量")
|
||||
@RestController
|
||||
@RequestMapping("/xslmes/mcs/mcsToMesMixWeight")
|
||||
@Slf4j
|
||||
public class McsToMesMixWeightController extends JeecgController<McsToMesMixWeight, IMcsToMesMixWeightService> {
|
||||
|
||||
@Autowired
|
||||
private IMcsToMesMixWeightService mcsToMesMixWeightService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*/
|
||||
@Operation(summary = "密炼物料称量-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<McsToMesMixWeight>> queryPageList(McsToMesMixWeight mcsToMesMixWeight,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<McsToMesMixWeight> queryWrapper = McsQueryHelper.buildWrapper(mcsToMesMixWeight, req.getParameterMap());
|
||||
Page<McsToMesMixWeight> page = new Page<>(pageNo, pageSize);
|
||||
IPage<McsToMesMixWeight> pageList = mcsToMesMixWeightService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*/
|
||||
@Operation(summary = "密炼物料称量-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<McsToMesMixWeight> queryById(@RequestParam(name = "id", required = true) String id) {
|
||||
McsToMesMixWeight entity = mcsToMesMixWeightService.getById(id);
|
||||
if (entity == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(entity);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出Excel
|
||||
*/
|
||||
@RequiresPermissions("xslmes:mcsToMesMixWeight:exportXls")
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, McsToMesMixWeight mcsToMesMixWeight) {
|
||||
return super.exportXls(request, mcsToMesMixWeight, McsToMesMixWeight.class, "密炼物料称量");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,77 @@
|
||||
package org.jeecg.modules.xslmes.mcs.controller;
|
||||
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import org.jeecg.common.api.vo.Result;
|
||||
import org.jeecg.modules.xslmes.mcs.util.McsQueryHelper;
|
||||
import org.jeecg.modules.xslmes.mcs.entity.MesToMcsMaterial;
|
||||
import org.jeecg.modules.xslmes.mcs.service.IMesToMcsMaterialService;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.jeecg.common.system.base.controller.JeecgController;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
|
||||
/**
|
||||
* @Description: MES下发物料
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Tag(name = "MES下发物料")
|
||||
@RestController
|
||||
@RequestMapping("/xslmes/mcs/mesToMcsMaterial")
|
||||
@Slf4j
|
||||
public class MesToMcsMaterialController extends JeecgController<MesToMcsMaterial, IMesToMcsMaterialService> {
|
||||
|
||||
@Autowired
|
||||
private IMesToMcsMaterialService mesToMcsMaterialService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*/
|
||||
@Operation(summary = "MES下发物料-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<MesToMcsMaterial>> queryPageList(MesToMcsMaterial mesToMcsMaterial,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<MesToMcsMaterial> queryWrapper = McsQueryHelper.buildWrapper(mesToMcsMaterial, req.getParameterMap());
|
||||
Page<MesToMcsMaterial> page = new Page<>(pageNo, pageSize);
|
||||
IPage<MesToMcsMaterial> pageList = mesToMcsMaterialService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*/
|
||||
@Operation(summary = "MES下发物料-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<MesToMcsMaterial> queryById(@RequestParam(name = "id", required = true) String id) {
|
||||
MesToMcsMaterial entity = mesToMcsMaterialService.getById(id);
|
||||
if (entity == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(entity);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出Excel
|
||||
*/
|
||||
@RequiresPermissions("xslmes:mesToMcsMaterial:exportXls")
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, MesToMcsMaterial mesToMcsMaterial) {
|
||||
return super.exportXls(request, mesToMcsMaterial, MesToMcsMaterial.class, "MES下发物料");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,77 @@
|
||||
package org.jeecg.modules.xslmes.mcs.controller;
|
||||
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import org.jeecg.common.api.vo.Result;
|
||||
import org.jeecg.modules.xslmes.mcs.util.McsQueryHelper;
|
||||
import org.jeecg.modules.xslmes.mcs.entity.MesToMcsMixPlan;
|
||||
import org.jeecg.modules.xslmes.mcs.service.IMesToMcsMixPlanService;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.jeecg.common.system.base.controller.JeecgController;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
|
||||
/**
|
||||
* @Description: MES下发混炼计划
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Tag(name = "MES下发混炼计划")
|
||||
@RestController
|
||||
@RequestMapping("/xslmes/mcs/mesToMcsMixPlan")
|
||||
@Slf4j
|
||||
public class MesToMcsMixPlanController extends JeecgController<MesToMcsMixPlan, IMesToMcsMixPlanService> {
|
||||
|
||||
@Autowired
|
||||
private IMesToMcsMixPlanService mesToMcsMixPlanService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*/
|
||||
@Operation(summary = "MES下发混炼计划-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<MesToMcsMixPlan>> queryPageList(MesToMcsMixPlan mesToMcsMixPlan,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<MesToMcsMixPlan> queryWrapper = McsQueryHelper.buildWrapper(mesToMcsMixPlan, req.getParameterMap());
|
||||
Page<MesToMcsMixPlan> page = new Page<>(pageNo, pageSize);
|
||||
IPage<MesToMcsMixPlan> pageList = mesToMcsMixPlanService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*/
|
||||
@Operation(summary = "MES下发混炼计划-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<MesToMcsMixPlan> queryById(@RequestParam(name = "id", required = true) String id) {
|
||||
MesToMcsMixPlan entity = mesToMcsMixPlanService.getById(id);
|
||||
if (entity == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(entity);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出Excel
|
||||
*/
|
||||
@RequiresPermissions("xslmes:mesToMcsMixPlan:exportXls")
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, MesToMcsMixPlan mesToMcsMixPlan) {
|
||||
return super.exportXls(request, mesToMcsMixPlan, MesToMcsMixPlan.class, "MES下发混炼计划");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,77 @@
|
||||
package org.jeecg.modules.xslmes.mcs.controller;
|
||||
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import org.jeecg.common.api.vo.Result;
|
||||
import org.jeecg.modules.xslmes.mcs.util.McsQueryHelper;
|
||||
import org.jeecg.modules.xslmes.mcs.entity.MesToMcsRecipe;
|
||||
import org.jeecg.modules.xslmes.mcs.service.IMesToMcsRecipeService;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.jeecg.common.system.base.controller.JeecgController;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
|
||||
/**
|
||||
* @Description: MES下发配方
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Tag(name = "MES下发配方")
|
||||
@RestController
|
||||
@RequestMapping("/xslmes/mcs/mesToMcsRecipe")
|
||||
@Slf4j
|
||||
public class MesToMcsRecipeController extends JeecgController<MesToMcsRecipe, IMesToMcsRecipeService> {
|
||||
|
||||
@Autowired
|
||||
private IMesToMcsRecipeService mesToMcsRecipeService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*/
|
||||
@Operation(summary = "MES下发配方-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<MesToMcsRecipe>> queryPageList(MesToMcsRecipe mesToMcsRecipe,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<MesToMcsRecipe> queryWrapper = McsQueryHelper.buildWrapper(mesToMcsRecipe, req.getParameterMap());
|
||||
Page<MesToMcsRecipe> page = new Page<>(pageNo, pageSize);
|
||||
IPage<MesToMcsRecipe> pageList = mesToMcsRecipeService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*/
|
||||
@Operation(summary = "MES下发配方-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<MesToMcsRecipe> queryById(@RequestParam(name = "id", required = true) String id) {
|
||||
MesToMcsRecipe entity = mesToMcsRecipeService.getById(id);
|
||||
if (entity == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(entity);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出Excel
|
||||
*/
|
||||
@RequiresPermissions("xslmes:mesToMcsRecipe:exportXls")
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, MesToMcsRecipe mesToMcsRecipe) {
|
||||
return super.exportXls(request, mesToMcsRecipe, MesToMcsRecipe.class, "MES下发配方");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,77 @@
|
||||
package org.jeecg.modules.xslmes.mcs.controller;
|
||||
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import org.jeecg.common.api.vo.Result;
|
||||
import org.jeecg.modules.xslmes.mcs.util.McsQueryHelper;
|
||||
import org.jeecg.modules.xslmes.mcs.entity.MesToMcsRecipeMixStep;
|
||||
import org.jeecg.modules.xslmes.mcs.service.IMesToMcsRecipeMixStepService;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.jeecg.common.system.base.controller.JeecgController;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
|
||||
/**
|
||||
* @Description: MES下发配方步序
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Tag(name = "MES下发配方步序")
|
||||
@RestController
|
||||
@RequestMapping("/xslmes/mcs/mesToMcsRecipeMixStep")
|
||||
@Slf4j
|
||||
public class MesToMcsRecipeMixStepController extends JeecgController<MesToMcsRecipeMixStep, IMesToMcsRecipeMixStepService> {
|
||||
|
||||
@Autowired
|
||||
private IMesToMcsRecipeMixStepService mesToMcsRecipeMixStepService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*/
|
||||
@Operation(summary = "MES下发配方步序-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<MesToMcsRecipeMixStep>> queryPageList(MesToMcsRecipeMixStep mesToMcsRecipeMixStep,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<MesToMcsRecipeMixStep> queryWrapper = McsQueryHelper.buildWrapper(mesToMcsRecipeMixStep, req.getParameterMap());
|
||||
Page<MesToMcsRecipeMixStep> page = new Page<>(pageNo, pageSize);
|
||||
IPage<MesToMcsRecipeMixStep> pageList = mesToMcsRecipeMixStepService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*/
|
||||
@Operation(summary = "MES下发配方步序-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<MesToMcsRecipeMixStep> queryById(@RequestParam(name = "id", required = true) String id) {
|
||||
MesToMcsRecipeMixStep entity = mesToMcsRecipeMixStepService.getById(id);
|
||||
if (entity == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(entity);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出Excel
|
||||
*/
|
||||
@RequiresPermissions("xslmes:mesToMcsRecipeMixStep:exportXls")
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, MesToMcsRecipeMixStep mesToMcsRecipeMixStep) {
|
||||
return super.exportXls(request, mesToMcsRecipeMixStep, MesToMcsRecipeMixStep.class, "MES下发配方步序");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,77 @@
|
||||
package org.jeecg.modules.xslmes.mcs.controller;
|
||||
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import org.jeecg.common.api.vo.Result;
|
||||
import org.jeecg.modules.xslmes.mcs.util.McsQueryHelper;
|
||||
import org.jeecg.modules.xslmes.mcs.entity.MesToMcsRecipeWeight;
|
||||
import org.jeecg.modules.xslmes.mcs.service.IMesToMcsRecipeWeightService;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.jeecg.common.system.base.controller.JeecgController;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
|
||||
/**
|
||||
* @Description: MES下发配方称量
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Tag(name = "MES下发配方称量")
|
||||
@RestController
|
||||
@RequestMapping("/xslmes/mcs/mesToMcsRecipeWeight")
|
||||
@Slf4j
|
||||
public class MesToMcsRecipeWeightController extends JeecgController<MesToMcsRecipeWeight, IMesToMcsRecipeWeightService> {
|
||||
|
||||
@Autowired
|
||||
private IMesToMcsRecipeWeightService mesToMcsRecipeWeightService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*/
|
||||
@Operation(summary = "MES下发配方称量-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<MesToMcsRecipeWeight>> queryPageList(MesToMcsRecipeWeight mesToMcsRecipeWeight,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<MesToMcsRecipeWeight> queryWrapper = McsQueryHelper.buildWrapper(mesToMcsRecipeWeight, req.getParameterMap());
|
||||
Page<MesToMcsRecipeWeight> page = new Page<>(pageNo, pageSize);
|
||||
IPage<MesToMcsRecipeWeight> pageList = mesToMcsRecipeWeightService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*/
|
||||
@Operation(summary = "MES下发配方称量-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<MesToMcsRecipeWeight> queryById(@RequestParam(name = "id", required = true) String id) {
|
||||
MesToMcsRecipeWeight entity = mesToMcsRecipeWeightService.getById(id);
|
||||
if (entity == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(entity);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出Excel
|
||||
*/
|
||||
@RequiresPermissions("xslmes:mesToMcsRecipeWeight:exportXls")
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, MesToMcsRecipeWeight mesToMcsRecipeWeight) {
|
||||
return super.exportXls(request, mesToMcsRecipeWeight, MesToMcsRecipeWeight.class, "MES下发配方称量");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,83 @@
|
||||
package org.jeecg.modules.xslmes.mcs.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
/**
|
||||
* @Description: 上辅机报警记录
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("MCSToMES_Alarm")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@Schema(description = "上辅机报警记录")
|
||||
public class McsToMesAlarm implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId(value = "GUID", type = IdType.ASSIGN_ID)
|
||||
@Schema(description = "主键")
|
||||
private String guid;
|
||||
|
||||
@Excel(name = "机台编号", width = 15)
|
||||
@Schema(description = "机台编号")
|
||||
@TableField("EquipId")
|
||||
private String equipId;
|
||||
|
||||
@Excel(name = "机台名称", width = 15)
|
||||
@Schema(description = "机台名称")
|
||||
@TableField("EquipName")
|
||||
private String equipName;
|
||||
|
||||
@Excel(name = "机台类型", width = 15)
|
||||
@Schema(description = "机台类型")
|
||||
@TableField("EquipType")
|
||||
private String equipType;
|
||||
|
||||
@Excel(name = "Barcode", width = 20)
|
||||
@Schema(description = "Barcode")
|
||||
@TableField("Barcode")
|
||||
private String barcode;
|
||||
|
||||
@Excel(name = "报警代码", width = 15)
|
||||
@Schema(description = "报警代码")
|
||||
@TableField("AlmCode")
|
||||
private String almCode;
|
||||
|
||||
@Excel(name = "报警内容", width = 25)
|
||||
@Schema(description = "报警内容")
|
||||
@TableField("AlarmInf")
|
||||
private String alarmInf;
|
||||
|
||||
@Excel(name = "写入时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Schema(description = "写入时间")
|
||||
@TableField("WriteTime")
|
||||
private Date writeTime;
|
||||
|
||||
@Excel(name = "读取时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Schema(description = "读取时间")
|
||||
@TableField("ReadTime")
|
||||
private Date readTime;
|
||||
|
||||
@Excel(name = "交互标识", width = 10)
|
||||
@Schema(description = "交互标识")
|
||||
@TableField("MES_Flag")
|
||||
private Integer mesFlag;
|
||||
}
|
||||
@@ -0,0 +1,88 @@
|
||||
package org.jeecg.modules.xslmes.mcs.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
/**
|
||||
* @Description: 自动卸料日志
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("MCSToMES_AutoXLLog")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@Schema(description = "自动卸料日志")
|
||||
public class McsToMesAutoXlLog implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId(value = "GUID", type = IdType.INPUT)
|
||||
@Schema(description = "GUID")
|
||||
private Long guid;
|
||||
|
||||
@Excel(name = "设备ID", width = 10)
|
||||
@Schema(description = "设备ID")
|
||||
@TableField("EquipID")
|
||||
private Integer equipId;
|
||||
|
||||
@Excel(name = "机台名称", width = 15)
|
||||
@Schema(description = "机台名称")
|
||||
@TableField("EquipName")
|
||||
private String equipName;
|
||||
|
||||
@Excel(name = "机台类型", width = 15)
|
||||
@Schema(description = "机台类型")
|
||||
@TableField("EquipType")
|
||||
private String equipType;
|
||||
|
||||
@Excel(name = "计划编号", width = 25)
|
||||
@Schema(description = "计划编号")
|
||||
@TableField("PlanID")
|
||||
private String planId;
|
||||
|
||||
@Excel(name = "卸料车号", width = 20)
|
||||
@Schema(description = "卸料车号")
|
||||
@TableField("XLCarNum")
|
||||
private String xlCarNum;
|
||||
|
||||
@Excel(name = "卸料条码", width = 25)
|
||||
@Schema(description = "卸料条码")
|
||||
@TableField("XLBarcode")
|
||||
private String xlBarcode;
|
||||
|
||||
@Excel(name = "RFID", width = 25)
|
||||
@Schema(description = "RFID")
|
||||
@TableField("RFID")
|
||||
private String rfid;
|
||||
|
||||
@Excel(name = "写入时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Schema(description = "写入时间")
|
||||
@TableField("WriteTime")
|
||||
private Date writeTime;
|
||||
|
||||
@Excel(name = "读取时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Schema(description = "读取时间")
|
||||
@TableField("ReadTime")
|
||||
private Date readTime;
|
||||
|
||||
@Excel(name = "交互标识", width = 10)
|
||||
@Schema(description = "交互标识")
|
||||
@TableField("MES_Flag")
|
||||
private Integer mesFlag;
|
||||
}
|
||||
@@ -0,0 +1,103 @@
|
||||
package org.jeecg.modules.xslmes.mcs.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
/**
|
||||
* @Description: 料仓物料对应
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("MCSToMES_BinToMater")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@Schema(description = "料仓物料对应")
|
||||
public class McsToMesBinToMater implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId(value = "GUID", type = IdType.ASSIGN_ID)
|
||||
@Schema(description = "主键")
|
||||
private String guid;
|
||||
|
||||
@Excel(name = "机台编号", width = 15)
|
||||
@Schema(description = "机台编号")
|
||||
@TableField("EquipID")
|
||||
private String equipId;
|
||||
|
||||
@Excel(name = "机台名称", width = 15)
|
||||
@Schema(description = "机台名称")
|
||||
@TableField("EquipName")
|
||||
private String equipName;
|
||||
|
||||
@Excel(name = "机台类型", width = 15)
|
||||
@Schema(description = "机台类型")
|
||||
@TableField("EquipType")
|
||||
private String equipType;
|
||||
|
||||
@Excel(name = "秤编号", width = 10)
|
||||
@Schema(description = "秤编号")
|
||||
@TableField("ScaleNum")
|
||||
private Integer scaleNum;
|
||||
|
||||
@Excel(name = "秤类别", width = 10)
|
||||
@Schema(description = "秤类别")
|
||||
@TableField("ScaleClass")
|
||||
private String scaleClass;
|
||||
|
||||
@Excel(name = "秤名称", width = 15)
|
||||
@Schema(description = "秤名称")
|
||||
@TableField("ScaleName")
|
||||
private String scaleName;
|
||||
|
||||
@Excel(name = "料仓编号", width = 10)
|
||||
@Schema(description = "料仓编号")
|
||||
@TableField("BinNo")
|
||||
private Integer binNo;
|
||||
|
||||
@Excel(name = "物料代码", width = 20)
|
||||
@Schema(description = "物料代码")
|
||||
@TableField("MatCode")
|
||||
private String matCode;
|
||||
|
||||
@Excel(name = "物料名称", width = 20)
|
||||
@Schema(description = "物料名称")
|
||||
@TableField("MatName")
|
||||
private String matName;
|
||||
|
||||
@Excel(name = "是否使用", width = 10)
|
||||
@Schema(description = "是否使用")
|
||||
@TableField("UseYN")
|
||||
private String useYn;
|
||||
|
||||
@Excel(name = "写入时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Schema(description = "写入时间")
|
||||
@TableField("WriteTime")
|
||||
private Date writeTime;
|
||||
|
||||
@Excel(name = "读取时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Schema(description = "读取时间")
|
||||
@TableField("ReadTime")
|
||||
private Date readTime;
|
||||
|
||||
@Excel(name = "交互标识", width = 10)
|
||||
@Schema(description = "交互标识")
|
||||
@TableField("MES_Flag")
|
||||
private Integer mesFlag;
|
||||
}
|
||||
@@ -0,0 +1,95 @@
|
||||
package org.jeecg.modules.xslmes.mcs.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
/**
|
||||
* @Description: 称量校验日志
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("MCSToMES_CheckScaleLog")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@Schema(description = "称量校验日志")
|
||||
public class McsToMesCheckScaleLog implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId(value = "Guid", type = IdType.INPUT)
|
||||
@Schema(description = "GUID")
|
||||
private String guid;
|
||||
|
||||
@Excel(name = "Tand", width = 20)
|
||||
@Schema(description = "Tand")
|
||||
@TableField("Tand")
|
||||
private String tand;
|
||||
|
||||
@Excel(name = "Tanz", width = 20)
|
||||
@Schema(description = "Tanz")
|
||||
@TableField("Tanz")
|
||||
private String tanz;
|
||||
|
||||
@Excel(name = "Fend", width = 20)
|
||||
@Schema(description = "Fend")
|
||||
@TableField("Fend")
|
||||
private String fend;
|
||||
|
||||
@Excel(name = "Fenz", width = 20)
|
||||
@Schema(description = "Fenz")
|
||||
@TableField("Fenz")
|
||||
private String fenz;
|
||||
|
||||
@Excel(name = "Youd", width = 20)
|
||||
@Schema(description = "Youd")
|
||||
@TableField("Youd")
|
||||
private String youd;
|
||||
|
||||
@Excel(name = "Youz", width = 20)
|
||||
@Schema(description = "Youz")
|
||||
@TableField("Youz")
|
||||
private String youz;
|
||||
|
||||
@Excel(name = "Yed", width = 20)
|
||||
@Schema(description = "Yed")
|
||||
@TableField("Yed")
|
||||
private String yed;
|
||||
|
||||
@Excel(name = "校验日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Schema(description = "校验日期")
|
||||
@TableField("Cdate")
|
||||
private Date cdate;
|
||||
|
||||
@Excel(name = "写入时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Schema(description = "写入时间")
|
||||
@TableField("WriteTime")
|
||||
private Date writeTime;
|
||||
|
||||
@Excel(name = "读取时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Schema(description = "读取时间")
|
||||
@TableField("ReadTime")
|
||||
private Date readTime;
|
||||
|
||||
@Excel(name = "交互标识", width = 10)
|
||||
@Schema(description = "交互标识")
|
||||
@TableField("MES_Flag")
|
||||
private Integer mesFlag;
|
||||
}
|
||||
@@ -0,0 +1,75 @@
|
||||
package org.jeecg.modules.xslmes.mcs.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
/**
|
||||
* @Description: 密炼机动作状态
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("MCSToMES_MixAct")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@Schema(description = "密炼机动作状态")
|
||||
public class McsToMesMixAct implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
// 该表无主键，以 EquipID 作逻辑标识
|
||||
@TableId(value = "EquipID", type = IdType.INPUT)
|
||||
@Schema(description = "机台编号")
|
||||
@Excel(name = "机台编号", width = 15)
|
||||
private String equipId;
|
||||
|
||||
@Excel(name = "机台名称", width = 15)
|
||||
@Schema(description = "机台名称")
|
||||
@TableField("EquipName")
|
||||
private String equipName;
|
||||
|
||||
@Excel(name = "机台类型", width = 15)
|
||||
@Schema(description = "机台类型")
|
||||
@TableField("EquipType")
|
||||
private String equipType;
|
||||
|
||||
@Excel(name = "动作地址", width = 10)
|
||||
@Schema(description = "动作地址")
|
||||
@TableField("MixActAddress")
|
||||
private Integer mixActAddress;
|
||||
|
||||
@Excel(name = "动作名称", width = 25)
|
||||
@Schema(description = "动作名称")
|
||||
@TableField("MixActName")
|
||||
private String mixActName;
|
||||
|
||||
@Excel(name = "写入时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Schema(description = "写入时间")
|
||||
@TableField("WriteTime")
|
||||
private Date writeTime;
|
||||
|
||||
@Excel(name = "读取时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Schema(description = "读取时间")
|
||||
@TableField("ReadTime")
|
||||
private Date readTime;
|
||||
|
||||
@Excel(name = "读写标识", width = 10)
|
||||
@Schema(description = "读写标识")
|
||||
@TableField("RW_Flag")
|
||||
private Integer rwFlag;
|
||||
}
|
||||
@@ -0,0 +1,93 @@
|
||||
package org.jeecg.modules.xslmes.mcs.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
/**
|
||||
* @Description: 密炼机报警记录
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("MCSToMES_MixAlarm")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@Schema(description = "密炼机报警记录")
|
||||
public class McsToMesMixAlarm implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId(value = "GUID", type = IdType.ASSIGN_ID)
|
||||
@Schema(description = "主键")
|
||||
private String guid;
|
||||
|
||||
@Excel(name = "机台编号", width = 15)
|
||||
@Schema(description = "机台编号")
|
||||
@TableField("EquipID")
|
||||
private String equipId;
|
||||
|
||||
@Excel(name = "机台名称", width = 15)
|
||||
@Schema(description = "机台名称")
|
||||
@TableField("EquipName")
|
||||
private String equipName;
|
||||
|
||||
@Excel(name = "机台类型", width = 15)
|
||||
@Schema(description = "机台类型")
|
||||
@TableField("EquipType")
|
||||
private String equipType;
|
||||
|
||||
@Excel(name = "开始时间", width = 20)
|
||||
@Schema(description = "开始时间")
|
||||
@TableField("SaveTime")
|
||||
private String saveTime;
|
||||
|
||||
@Excel(name = "结束时间", width = 20)
|
||||
@Schema(description = "结束时间")
|
||||
@TableField("EndTime")
|
||||
private String endTime;
|
||||
|
||||
@Excel(name = "Barcode", width = 20)
|
||||
@Schema(description = "Barcode")
|
||||
@TableField("Barcode")
|
||||
private String barcode;
|
||||
|
||||
@Excel(name = "报警代码", width = 15)
|
||||
@Schema(description = "报警代码")
|
||||
@TableField("AlmCode")
|
||||
private String almCode;
|
||||
|
||||
@Excel(name = "报警内容", width = 30)
|
||||
@Schema(description = "报警内容")
|
||||
@TableField("AlarmInf")
|
||||
private String alarmInf;
|
||||
|
||||
@Excel(name = "写入时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Schema(description = "写入时间")
|
||||
@TableField("WriteTime")
|
||||
private Date writeTime;
|
||||
|
||||
@Excel(name = "读取时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Schema(description = "读取时间")
|
||||
@TableField("ReadTime")
|
||||
private Date readTime;
|
||||
|
||||
@Excel(name = "交互标识", width = 10)
|
||||
@Schema(description = "交互标识")
|
||||
@TableField("MES_Flag")
|
||||
private Integer mesFlag;
|
||||
}
|
||||
@@ -0,0 +1,239 @@
|
||||
package org.jeecg.modules.xslmes.mcs.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
import java.math.BigDecimal;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
/**
|
||||
* @Description: 密炼批次数据
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("MCSToMES_MixBatch")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@Schema(description = "密炼批次数据")
|
||||
public class McsToMesMixBatch implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId(value = "GUID", type = IdType.INPUT)
|
||||
@Schema(description = "GUID")
|
||||
private String guid;
|
||||
|
||||
@Excel(name = "机台编号", width = 15)
|
||||
@Schema(description = "机台编号")
|
||||
@TableField("EquipID")
|
||||
private String equipId;
|
||||
|
||||
@Excel(name = "机台名称", width = 15)
|
||||
@Schema(description = "机台名称")
|
||||
@TableField("EquipName")
|
||||
private String equipName;
|
||||
|
||||
@Excel(name = "机台类型", width = 15)
|
||||
@Schema(description = "机台类型")
|
||||
@TableField("EquipType")
|
||||
private String equipType;
|
||||
|
||||
@Excel(name = "计划编号+车次", width = 20)
|
||||
@Schema(description = "计划编号+车次")
|
||||
@TableField("Barcode")
|
||||
private String barcode;
|
||||
|
||||
@Excel(name = "配方代码", width = 20)
|
||||
@Schema(description = "配方代码")
|
||||
@TableField("RecipCode")
|
||||
private String recipCode;
|
||||
|
||||
@Excel(name = "配方名称", width = 20)
|
||||
@Schema(description = "配方名称")
|
||||
@TableField("RecipName")
|
||||
private String recipName;
|
||||
|
||||
@Excel(name = "物料代码", width = 20)
|
||||
@Schema(description = "物料代码")
|
||||
@TableField("MaterCode")
|
||||
private String materCode;
|
||||
|
||||
@Excel(name = "物料名称", width = 30)
|
||||
@Schema(description = "物料名称")
|
||||
@TableField("MaterName")
|
||||
private String materName;
|
||||
|
||||
@Excel(name = "保存日期", width = 15)
|
||||
@Schema(description = "保存日期")
|
||||
@TableField("SaveDate")
|
||||
private String saveDate;
|
||||
|
||||
@Excel(name = "保存时间", width = 20)
|
||||
@Schema(description = "保存时间")
|
||||
@TableField("SaveDateTime")
|
||||
private String saveDateTime;
|
||||
|
||||
@Excel(name = "班次", width = 8)
|
||||
@Schema(description = "班次：1=Night 2=Morning 3=Noon")
|
||||
@TableField("ShiftId")
|
||||
private String shiftId;
|
||||
|
||||
@Excel(name = "班组", width = 8)
|
||||
@Schema(description = "班组：1=A 2=B 3=C 4=D")
|
||||
@TableField("ShiftClass")
|
||||
private String shiftClass;
|
||||
|
||||
@Excel(name = "计划编号", width = 20)
|
||||
@Schema(description = "计划编号")
|
||||
@TableField("PlanID")
|
||||
private String planId;
|
||||
|
||||
@Excel(name = "设定车次", width = 10)
|
||||
@Schema(description = "设定车次")
|
||||
@TableField("SetNum")
|
||||
private Integer setNum;
|
||||
|
||||
@Excel(name = "开始时间", width = 20)
|
||||
@Schema(description = "开始时间")
|
||||
@TableField("StartTim")
|
||||
private String startTim;
|
||||
|
||||
@Excel(name = "结束时间", width = 20)
|
||||
@Schema(description = "结束时间")
|
||||
@TableField("EndTim")
|
||||
private String endTim;
|
||||
|
||||
@Excel(name = "当前车次", width = 10)
|
||||
@Schema(description = "当前车次")
|
||||
@TableField("BatchNum")
|
||||
private Integer batchNum;
|
||||
|
||||
@Excel(name = "密炼模式", width = 10)
|
||||
@Schema(description = "密炼模式：1=遥控自动 2=遥控手动 3=本控")
|
||||
@TableField("MixMode")
|
||||
private Integer mixMode;
|
||||
|
||||
@Excel(name = "密炼循环时间", width = 12)
|
||||
@Schema(description = "密炼循环时间（预留）")
|
||||
@TableField("BatchCycleTim")
|
||||
private Integer batchCycleTim;
|
||||
|
||||
@Excel(name = "密炼时间", width = 10)
|
||||
@Schema(description = "密炼时间")
|
||||
@TableField("CurTim")
|
||||
private Integer curTim;
|
||||
|
||||
@Excel(name = "MixTim", width = 10)
|
||||
@Schema(description = "预留")
|
||||
@TableField("MixTim")
|
||||
private Integer mixTim;
|
||||
|
||||
@Excel(name = "有效时间", width = 10)
|
||||
@Schema(description = "有效时间")
|
||||
@TableField("UsefulMixTim")
|
||||
private Integer usefulMixTim;
|
||||
|
||||
@Excel(name = "间隔时间", width = 10)
|
||||
@Schema(description = "间隔时间")
|
||||
@TableField("IntervalTime")
|
||||
private Integer intervalTime;
|
||||
|
||||
@Excel(name = "排胶温度", width = 12)
|
||||
@Schema(description = "排胶温度")
|
||||
@TableField("DiscTemp")
|
||||
private BigDecimal discTemp;
|
||||
|
||||
@Excel(name = "排胶能量", width = 12)
|
||||
@Schema(description = "排胶能量")
|
||||
@TableField("DiscEnergy")
|
||||
private BigDecimal discEnergy;
|
||||
|
||||
@Excel(name = "排胶时间", width = 10)
|
||||
@Schema(description = "排胶时间")
|
||||
@TableField("DiscTime")
|
||||
private Integer discTime;
|
||||
|
||||
@Excel(name = "排胶功率", width = 10)
|
||||
@Schema(description = "排胶功率")
|
||||
@TableField("DiscPower")
|
||||
private Integer discPower;
|
||||
|
||||
@Excel(name = "排胶方式", width = 10)
|
||||
@Schema(description = "排胶方式：0=正常 1=超时 2=超温 3=超能量")
|
||||
@TableField("EmgyDiscFlag")
|
||||
private Integer emgyDiscFlag;
|
||||
|
||||
@Excel(name = "三区温度1", width = 12)
|
||||
@Schema(description = "三区温度1（预留）")
|
||||
@TableField("TCU1Temp")
|
||||
private BigDecimal tcu1Temp;
|
||||
|
||||
@Excel(name = "三区温度2", width = 12)
|
||||
@Schema(description = "三区温度2（预留）")
|
||||
@TableField("TCU2Temp")
|
||||
private BigDecimal tcu2Temp;
|
||||
|
||||
@Excel(name = "三区温度3", width = 12)
|
||||
@Schema(description = "三区温度3（预留）")
|
||||
@TableField("TCU3Temp")
|
||||
private BigDecimal tcu3Temp;
|
||||
|
||||
@Excel(name = "三区温度4", width = 12)
|
||||
@Schema(description = "三区温度4（预留）")
|
||||
@TableField("TCU4Temp")
|
||||
private BigDecimal tcu4Temp;
|
||||
|
||||
@Excel(name = "三区温度", width = 12)
|
||||
@Schema(description = "三区温度（预留）")
|
||||
@TableField("TCUTemp")
|
||||
private BigDecimal tcuTemp;
|
||||
|
||||
@Excel(name = "批次重量", width = 12)
|
||||
@Schema(description = "批次重量")
|
||||
@TableField("BatchWei")
|
||||
private BigDecimal batchWei;
|
||||
|
||||
@Excel(name = "操作员", width = 15)
|
||||
@Schema(description = "操作员")
|
||||
@TableField("oper")
|
||||
private String oper;
|
||||
|
||||
@Excel(name = "写入时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Schema(description = "写入时间")
|
||||
@TableField("WriteTime")
|
||||
private Date writeTime;
|
||||
|
||||
@Excel(name = "读取时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Schema(description = "读取时间")
|
||||
@TableField("ReadTime")
|
||||
private Date readTime;
|
||||
|
||||
@Excel(name = "交互标识", width = 10)
|
||||
@Schema(description = "交互标识")
|
||||
@TableField("MES_Flag")
|
||||
private Integer mesFlag;
|
||||
|
||||
@Excel(name = "重量", width = 12)
|
||||
@Schema(description = "重量")
|
||||
@TableField("WEIGHT")
|
||||
private BigDecimal weight;
|
||||
|
||||
@Excel(name = "工单号", width = 20)
|
||||
@Schema(description = "工单号")
|
||||
@TableField("MoCode")
|
||||
private String moCode;
|
||||
}
|
||||
@@ -0,0 +1,75 @@
|
||||
package org.jeecg.modules.xslmes.mcs.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
/**
|
||||
* @Description: 密炼机控制参数
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("MCSToMES_MixCon")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@Schema(description = "密炼机控制参数")
|
||||
public class McsToMesMixCon implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
// 该表无主键，以 EquipID 作逻辑标识
|
||||
@TableId(value = "EquipID", type = IdType.INPUT)
|
||||
@Schema(description = "机台编号")
|
||||
@Excel(name = "机台编号", width = 15)
|
||||
private String equipId;
|
||||
|
||||
@Excel(name = "机台名称", width = 15)
|
||||
@Schema(description = "机台名称")
|
||||
@TableField("EquipName")
|
||||
private String equipName;
|
||||
|
||||
@Excel(name = "机台类型", width = 15)
|
||||
@Schema(description = "机台类型")
|
||||
@TableField("EquipType")
|
||||
private String equipType;
|
||||
|
||||
@Excel(name = "控制参数地址", width = 12)
|
||||
@Schema(description = "控制参数地址")
|
||||
@TableField("MixConAddress")
|
||||
private Integer mixConAddress;
|
||||
|
||||
@Excel(name = "控制参数名称", width = 25)
|
||||
@Schema(description = "控制参数名称")
|
||||
@TableField("MixConName")
|
||||
private String mixConName;
|
||||
|
||||
@Excel(name = "写入时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Schema(description = "写入时间")
|
||||
@TableField("WriteTime")
|
||||
private Date writeTime;
|
||||
|
||||
@Excel(name = "读取时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Schema(description = "读取时间")
|
||||
@TableField("ReadTime")
|
||||
private Date readTime;
|
||||
|
||||
@Excel(name = "读写标识", width = 10)
|
||||
@Schema(description = "读写标识")
|
||||
@TableField("RW_Flag")
|
||||
private Integer rwFlag;
|
||||
}
|
||||
@@ -0,0 +1,77 @@
|
||||
package org.jeecg.modules.xslmes.mcs.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
/**
|
||||
* @Description: 密炼过程曲线
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("MCSToMES_MixCurve")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@Schema(description = "密炼过程曲线")
|
||||
public class McsToMesMixCurve implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId(value = "GUID", type = IdType.INPUT)
|
||||
@Schema(description = "GUID")
|
||||
private String guid;
|
||||
|
||||
@Excel(name = "机台编号", width = 15)
|
||||
@Schema(description = "机台编号")
|
||||
@TableField("EquipID")
|
||||
private String equipId;
|
||||
|
||||
@Excel(name = "机台名称", width = 15)
|
||||
@Schema(description = "机台名称")
|
||||
@TableField("EquipName")
|
||||
private String equipName;
|
||||
|
||||
@Excel(name = "机台类型", width = 15)
|
||||
@Schema(description = "机台类型")
|
||||
@TableField("EquipType")
|
||||
private String equipType;
|
||||
|
||||
@Excel(name = "Barcode", width = 20)
|
||||
@Schema(description = "Barcode")
|
||||
@TableField("Barcode")
|
||||
private String barcode;
|
||||
|
||||
@Schema(description = "曲线数据（ntext）")
|
||||
@TableField("CurveData")
|
||||
private String curveData;
|
||||
|
||||
@Excel(name = "写入时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Schema(description = "写入时间")
|
||||
@TableField("WriteTime")
|
||||
private Date writeTime;
|
||||
|
||||
@Excel(name = "读取时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Schema(description = "读取时间")
|
||||
@TableField("ReadTime")
|
||||
private Date readTime;
|
||||
|
||||
@Excel(name = "交互标识", width = 10)
|
||||
@Schema(description = "交互标识")
|
||||
@TableField("MES_Flag")
|
||||
private Integer mesFlag;
|
||||
}
|
||||
@@ -0,0 +1,157 @@
|
||||
package org.jeecg.modules.xslmes.mcs.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
/**
|
||||
* @Description: 密炼执行计划
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("MCSToMES_MixExePlan")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@Schema(description = "密炼执行计划")
|
||||
public class McsToMesMixExePlan implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId(value = "GUID", type = IdType.INPUT)
|
||||
@Schema(description = "GUID")
|
||||
private String guid;
|
||||
|
||||
@Excel(name = "计划编号", width = 20)
|
||||
@Schema(description = "计划编号")
|
||||
@TableField("PlanID")
|
||||
private String planId;
|
||||
|
||||
@Excel(name = "计划来源", width = 10)
|
||||
@Schema(description = "计划来源")
|
||||
@TableField("PlanSource")
|
||||
private String planSource;
|
||||
|
||||
@Excel(name = "机台编号", width = 15)
|
||||
@Schema(description = "机台编号")
|
||||
@TableField("EquipID")
|
||||
private String equipId;
|
||||
|
||||
@Excel(name = "机台名称", width = 15)
|
||||
@Schema(description = "机台名称")
|
||||
@TableField("EquipName")
|
||||
private String equipName;
|
||||
|
||||
@Excel(name = "机台类型", width = 15)
|
||||
@Schema(description = "机台类型：CWS=小料；MCS=上辅机")
|
||||
@TableField("EquipType")
|
||||
private String equipType;
|
||||
|
||||
@Excel(name = "计划日期", width = 15)
|
||||
@Schema(description = "计划日期")
|
||||
@TableField("PlanDate")
|
||||
private String planDate;
|
||||
|
||||
@Excel(name = "班次", width = 8)
|
||||
@Schema(description = "班次：1=Night 2=Morning 3=Noon")
|
||||
@TableField("ShiftID")
|
||||
private String shiftId;
|
||||
|
||||
@Excel(name = "班组", width = 8)
|
||||
@Schema(description = "班组：1=A 2=B 3=C 4=D")
|
||||
@TableField("ShiftClass")
|
||||
private String shiftClass;
|
||||
|
||||
@Excel(name = "计划顺序", width = 10)
|
||||
@Schema(description = "计划顺序")
|
||||
@TableField("WorkOrder")
|
||||
private Integer workOrder;
|
||||
|
||||
@Excel(name = "配方代码", width = 25)
|
||||
@Schema(description = "配方代码")
|
||||
@TableField("RecipCode")
|
||||
private String recipCode;
|
||||
|
||||
@Excel(name = "配方名称", width = 25)
|
||||
@Schema(description = "配方名称")
|
||||
@TableField("RecipName")
|
||||
private String recipName;
|
||||
|
||||
@Excel(name = "设定车次", width = 10)
|
||||
@Schema(description = "设定车次")
|
||||
@TableField("SetNum")
|
||||
private Integer setNum;
|
||||
|
||||
@Excel(name = "完成车次", width = 10)
|
||||
@Schema(description = "完成车次")
|
||||
@TableField("DoneNum")
|
||||
private Integer doneNum;
|
||||
|
||||
@Excel(name = "计划状态", width = 10)
|
||||
@Schema(description = "计划状态：2=运行 4=终止 5=完成")
|
||||
@TableField("PlanState")
|
||||
private Integer planState;
|
||||
|
||||
@Excel(name = "计划状态变化", width = 12)
|
||||
@Schema(description = "计划状态变化")
|
||||
@TableField("PlanStateChange")
|
||||
private Integer planStateChange;
|
||||
|
||||
@Excel(name = "开始时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Schema(description = "开始时间")
|
||||
@TableField("StartTime")
|
||||
private Date startTime;
|
||||
|
||||
@Excel(name = "结束时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Schema(description = "结束时间")
|
||||
@TableField("EndTime")
|
||||
private Date endTime;
|
||||
|
||||
@Excel(name = "写入时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Schema(description = "写入时间")
|
||||
@TableField("WriteTime")
|
||||
private Date writeTime;
|
||||
|
||||
@Excel(name = "读取时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Schema(description = "读取时间")
|
||||
@TableField("ReadTime")
|
||||
private Date readTime;
|
||||
|
||||
@Excel(name = "交互标识", width = 10)
|
||||
@Schema(description = "交互标识")
|
||||
@TableField("MES_Flag")
|
||||
private Integer mesFlag;
|
||||
|
||||
@Excel(name = "备注", width = 25)
|
||||
@Schema(description = "备注")
|
||||
@TableField("Remark")
|
||||
private String remark;
|
||||
|
||||
@Excel(name = "物料代码", width = 20)
|
||||
@Schema(description = "物料代码")
|
||||
@TableField("MaterCode")
|
||||
private String materCode;
|
||||
|
||||
@Excel(name = "物料名称", width = 20)
|
||||
@Schema(description = "物料名称")
|
||||
@TableField("MaterName")
|
||||
private String materName;
|
||||
}
|
||||
@@ -0,0 +1,209 @@
|
||||
package org.jeecg.modules.xslmes.mcs.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
import java.math.BigDecimal;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
/**
|
||||
* @Description: 密炼步序数据
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("MCSToMES_MixStep")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@Schema(description = "密炼步序数据")
|
||||
public class McsToMesMixStep implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId(value = "GUID", type = IdType.INPUT)
|
||||
@Schema(description = "GUID")
|
||||
private String guid;
|
||||
|
||||
@Excel(name = "机台编号", width = 15)
|
||||
@Schema(description = "机台编号")
|
||||
@TableField("EquipID")
|
||||
private String equipId;
|
||||
|
||||
@Excel(name = "机台名称", width = 15)
|
||||
@Schema(description = "机台名称")
|
||||
@TableField("EquipName")
|
||||
private String equipName;
|
||||
|
||||
@Excel(name = "机台类型", width = 15)
|
||||
@Schema(description = "机台类型")
|
||||
@TableField("EquipType")
|
||||
private String equipType;
|
||||
|
||||
@Excel(name = "Barcode", width = 20)
|
||||
@Schema(description = "Barcode")
|
||||
@TableField("Barcode")
|
||||
private String barcode;
|
||||
|
||||
@Excel(name = "保存时间", width = 20)
|
||||
@Schema(description = "保存时间")
|
||||
@TableField("SaveTime")
|
||||
private String saveTime;
|
||||
|
||||
@Excel(name = "密炼步序", width = 10)
|
||||
@Schema(description = "密炼步序")
|
||||
@TableField("MixID")
|
||||
private Integer mixId;
|
||||
|
||||
@Excel(name = "条件地址", width = 10)
|
||||
@Schema(description = "条件地址")
|
||||
@TableField("Cond")
|
||||
private Integer cond;
|
||||
|
||||
@Excel(name = "条件名称", width = 20)
|
||||
@Schema(description = "条件名称")
|
||||
@TableField("CondName")
|
||||
private String condName;
|
||||
|
||||
@Excel(name = "设定时间", width = 10)
|
||||
@Schema(description = "设定时间（预留）")
|
||||
@TableField("Tim")
|
||||
private Integer tim;
|
||||
|
||||
@Excel(name = "时间保护", width = 10)
|
||||
@Schema(description = "时间保护（预留）")
|
||||
@TableField("TimProtect")
|
||||
private Integer timProtect;
|
||||
|
||||
@Excel(name = "实际时间", width = 10)
|
||||
@Schema(description = "实际时间")
|
||||
@TableField("TimAct")
|
||||
private Integer timAct;
|
||||
|
||||
@Excel(name = "设定温度", width = 10)
|
||||
@Schema(description = "设定温度（预留）")
|
||||
@TableField("Tempe")
|
||||
private BigDecimal tempe;
|
||||
|
||||
@Excel(name = "温度保护", width = 10)
|
||||
@Schema(description = "温度保护（预留）")
|
||||
@TableField("TempProtect")
|
||||
private BigDecimal tempProtect;
|
||||
|
||||
@Excel(name = "温度实际", width = 10)
|
||||
@Schema(description = "温度实际")
|
||||
@TableField("TempAct")
|
||||
private BigDecimal tempAct;
|
||||
|
||||
@Excel(name = "设定功率", width = 10)
|
||||
@Schema(description = "设定功率（预留）")
|
||||
@TableField("Power")
|
||||
private BigDecimal power;
|
||||
|
||||
@Excel(name = "功率保护", width = 10)
|
||||
@Schema(description = "功率保护（预留）")
|
||||
@TableField("PowerProtect")
|
||||
private BigDecimal powerProtect;
|
||||
|
||||
@Excel(name = "实际功率", width = 10)
|
||||
@Schema(description = "实际功率")
|
||||
@TableField("PowerAct")
|
||||
private BigDecimal powerAct;
|
||||
|
||||
@Excel(name = "设定能量", width = 10)
|
||||
@Schema(description = "设定能量（预留）")
|
||||
@TableField("Energy")
|
||||
private BigDecimal energy;
|
||||
|
||||
@Excel(name = "能量保护", width = 10)
|
||||
@Schema(description = "能量保护（预留）")
|
||||
@TableField("EnergyProtect")
|
||||
private BigDecimal energyProtect;
|
||||
|
||||
@Excel(name = "实际能量", width = 10)
|
||||
@Schema(description = "实际能量")
|
||||
@TableField("EnergyAct")
|
||||
private BigDecimal energyAct;
|
||||
|
||||
@Excel(name = "动作地址", width = 10)
|
||||
@Schema(description = "动作地址")
|
||||
@TableField("Act")
|
||||
private Integer act;
|
||||
|
||||
@Excel(name = "动作名称", width = 20)
|
||||
@Schema(description = "动作名称")
|
||||
@TableField("ActName")
|
||||
private String actName;
|
||||
|
||||
@Excel(name = "设定压力", width = 10)
|
||||
@Schema(description = "设定压力（预留）")
|
||||
@TableField("RamPress")
|
||||
private BigDecimal ramPress;
|
||||
|
||||
@Excel(name = "实际压力", width = 10)
|
||||
@Schema(description = "实际压力")
|
||||
@TableField("RamPressAct")
|
||||
private BigDecimal ramPressAct;
|
||||
|
||||
@Excel(name = "转速设定", width = 10)
|
||||
@Schema(description = "转速设定（预留）")
|
||||
@TableField("RotorSpd")
|
||||
private BigDecimal rotorSpd;
|
||||
|
||||
@Excel(name = "实际转速", width = 10)
|
||||
@Schema(description = "实际转速")
|
||||
@TableField("RotorSpdAct")
|
||||
private BigDecimal rotorSpdAct;
|
||||
|
||||
@Excel(name = "栓位置设定", width = 12)
|
||||
@Schema(description = "栓位置设定（预留）")
|
||||
@TableField("RamPos")
|
||||
private BigDecimal ramPos;
|
||||
|
||||
@Excel(name = "实际栓位置", width = 12)
|
||||
@Schema(description = "实际栓位置")
|
||||
@TableField("RamPosAct")
|
||||
private BigDecimal ramPosAct;
|
||||
|
||||
@Excel(name = "辊距设定", width = 10)
|
||||
@Schema(description = "辊距设定（预留）")
|
||||
@TableField("RollGap")
|
||||
private BigDecimal rollGap;
|
||||
|
||||
@Excel(name = "实际辊距", width = 10)
|
||||
@Schema(description = "实际辊距（预留）")
|
||||
@TableField("RollGapAct")
|
||||
private BigDecimal rollGapAct;
|
||||
|
||||
@Excel(name = "写入时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Schema(description = "写入时间")
|
||||
@TableField("WriteTime")
|
||||
private Date writeTime;
|
||||
|
||||
@Excel(name = "控制模式", width = 10)
|
||||
@Schema(description = "控制模式")
|
||||
@TableField("CtrlMode")
|
||||
private Integer ctrlMode;
|
||||
|
||||
@Excel(name = "读取时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Schema(description = "读取时间")
|
||||
@TableField("ReadTime")
|
||||
private Date readTime;
|
||||
|
||||
@Excel(name = "交互标识", width = 10)
|
||||
@Schema(description = "交互标识")
|
||||
@TableField("MES_Flag")
|
||||
private Integer mesFlag;
|
||||
}
|
||||
@@ -0,0 +1,164 @@
|
||||
package org.jeecg.modules.xslmes.mcs.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
import java.math.BigDecimal;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
/**
|
||||
* @Description: 密炼物料称量
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("MCSToMES_MixWeight")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@Schema(description = "密炼物料称量")
|
||||
public class McsToMesMixWeight implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId(value = "GUID", type = IdType.INPUT)
|
||||
@Schema(description = "GUID")
|
||||
private String guid;
|
||||
|
||||
@Excel(name = "机台编号", width = 15)
|
||||
@Schema(description = "机台编号")
|
||||
@TableField("EquipID")
|
||||
private String equipId;
|
||||
|
||||
@Excel(name = "机台名称", width = 15)
|
||||
@Schema(description = "机台名称")
|
||||
@TableField("EquipName")
|
||||
private String equipName;
|
||||
|
||||
@Excel(name = "机台类型", width = 15)
|
||||
@Schema(description = "机台类型")
|
||||
@TableField("EquipType")
|
||||
private String equipType;
|
||||
|
||||
@Excel(name = "Barcode", width = 20)
|
||||
@Schema(description = "Barcode")
|
||||
@TableField("Barcode")
|
||||
private String barcode;
|
||||
|
||||
@Excel(name = "存储时间", width = 20)
|
||||
@Schema(description = "存储时间")
|
||||
@TableField("SaveTime")
|
||||
private String saveTime;
|
||||
|
||||
@Excel(name = "物料代码", width = 20)
|
||||
@Schema(description = "物料代码")
|
||||
@TableField("MatCode")
|
||||
private String matCode;
|
||||
|
||||
@Excel(name = "物料名称", width = 20)
|
||||
@Schema(description = "物料名称")
|
||||
@TableField("MatName")
|
||||
private String matName;
|
||||
|
||||
@Excel(name = "秤编号", width = 10)
|
||||
@Schema(description = "秤编号")
|
||||
@TableField("ScaleNum")
|
||||
private Integer scaleNum;
|
||||
|
||||
@Excel(name = "车次", width = 10)
|
||||
@Schema(description = "车次")
|
||||
@TableField("BatchNum")
|
||||
private Integer batchNum;
|
||||
|
||||
@Excel(name = "动作", width = 10)
|
||||
@Schema(description = "动作")
|
||||
@TableField("Act")
|
||||
private Integer act;
|
||||
|
||||
@Excel(name = "序号", width = 10)
|
||||
@Schema(description = "序号")
|
||||
@TableField("Idx")
|
||||
private Integer idx;
|
||||
|
||||
@Excel(name = "第几批称量", width = 12)
|
||||
@Schema(description = "第几批称量")
|
||||
@TableField("ShiftNum")
|
||||
private Integer shiftNum;
|
||||
|
||||
@Excel(name = "设定重量", width = 12)
|
||||
@Schema(description = "设定重量")
|
||||
@TableField("SetWei")
|
||||
private BigDecimal setWei;
|
||||
|
||||
@Excel(name = "设定误差", width = 12)
|
||||
@Schema(description = "设定误差")
|
||||
@TableField("SetTol")
|
||||
private BigDecimal setTol;
|
||||
|
||||
@Excel(name = "实际重量", width = 12)
|
||||
@Schema(description = "实际重量")
|
||||
@TableField("ActWei")
|
||||
private BigDecimal actWei;
|
||||
|
||||
@Excel(name = "实际误差", width = 12)
|
||||
@Schema(description = "实际误差")
|
||||
@TableField("ActTol")
|
||||
private BigDecimal actTol;
|
||||
|
||||
@Excel(name = "步时间", width = 10)
|
||||
@Schema(description = "步时间")
|
||||
@TableField("StepTim")
|
||||
private Integer stepTim;
|
||||
|
||||
@Excel(name = "步模式", width = 10)
|
||||
@Schema(description = "步模式")
|
||||
@TableField("StepMode")
|
||||
private Integer stepMode;
|
||||
|
||||
@Excel(name = "配方名称", width = 20)
|
||||
@Schema(description = "配方名称")
|
||||
@TableField("RecipeName")
|
||||
private String recipeName;
|
||||
|
||||
@Excel(name = "计划编号", width = 20)
|
||||
@Schema(description = "计划编号")
|
||||
@TableField("PlanID")
|
||||
private String planId;
|
||||
|
||||
@Excel(name = "计划设定", width = 10)
|
||||
@Schema(description = "计划设定")
|
||||
@TableField("SetBatchNum")
|
||||
private Integer setBatchNum;
|
||||
|
||||
@Excel(name = "写入时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Schema(description = "写入时间")
|
||||
@TableField("WriteTime")
|
||||
private Date writeTime;
|
||||
|
||||
@Excel(name = "读取时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Schema(description = "读取时间")
|
||||
@TableField("ReadTime")
|
||||
private Date readTime;
|
||||
|
||||
@Excel(name = "交互标识", width = 10)
|
||||
@Schema(description = "交互标识")
|
||||
@TableField("MES_Flag")
|
||||
private Integer mesFlag;
|
||||
|
||||
@Excel(name = "工单号", width = 20)
|
||||
@Schema(description = "工单号")
|
||||
@TableField("MOCode")
|
||||
private String moCode;
|
||||
}
|
||||
@@ -0,0 +1,114 @@
|
||||
package org.jeecg.modules.xslmes.mcs.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
/**
|
||||
* @Description: MES下发物料
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("MESToMCS_Material")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@Schema(description = "MES下发物料")
|
||||
public class MesToMcsMaterial implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
// 实际复合PK(EquipID+MatCode+MatName+MatType)，以GUID作标识字段
|
||||
@TableId(value = "GUID", type = IdType.INPUT)
|
||||
@Schema(description = "GUID")
|
||||
private String guid;
|
||||
|
||||
@Excel(name = "机台号", width = 15)
|
||||
@Schema(description = "机台号")
|
||||
@TableField("EquipID")
|
||||
private String equipId;
|
||||
|
||||
@Excel(name = "机台类型", width = 15)
|
||||
@Schema(description = "机台类型：CWS=小料；MCS=上辅机")
|
||||
@TableField("EquipType")
|
||||
private String equipType;
|
||||
|
||||
@Excel(name = "物料代码", width = 25)
|
||||
@Schema(description = "物料代码")
|
||||
@TableField("MatCode")
|
||||
private String matCode;
|
||||
|
||||
@Excel(name = "物料名称", width = 25)
|
||||
@Schema(description = "物料名称")
|
||||
@TableField("MatName")
|
||||
private String matName;
|
||||
|
||||
@Excel(name = "物料条码", width = 25)
|
||||
@Schema(description = "物料条码扫描判断信息")
|
||||
@TableField("MatBarcode")
|
||||
private String matBarcode;
|
||||
|
||||
@Excel(name = "物料类型ID", width = 12)
|
||||
@Schema(description = "物料类型ID")
|
||||
@TableField("MatTypeID")
|
||||
private Integer matTypeId;
|
||||
|
||||
@Excel(name = "物料类别", width = 20)
|
||||
@Schema(description = "物料类别")
|
||||
@TableField("MatType")
|
||||
private String matType;
|
||||
|
||||
@Excel(name = "胶料类别ID", width = 12)
|
||||
@Schema(description = "胶料类别ID")
|
||||
@TableField("MatRubTypeID")
|
||||
private Integer matRubTypeId;
|
||||
|
||||
@Excel(name = "胶料类别", width = 15)
|
||||
@Schema(description = "胶料类别：0=胶块 1=胶片 2=胶粒")
|
||||
@TableField("MatRubType")
|
||||
private String matRubType;
|
||||
|
||||
@Excel(name = "秤ID", width = 10)
|
||||
@Schema(description = "秤ID")
|
||||
@TableField("ScaleID")
|
||||
private Integer scaleId;
|
||||
|
||||
@Excel(name = "秤名称", width = 20)
|
||||
@Schema(description = "秤名称")
|
||||
@TableField("ScaleName")
|
||||
private String scaleName;
|
||||
|
||||
@Excel(name = "小料设备号", width = 12)
|
||||
@Schema(description = "小料设备号")
|
||||
@TableField("CWSID")
|
||||
private Integer cwsId;
|
||||
|
||||
@Excel(name = "写入时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Schema(description = "写入时间")
|
||||
@TableField("WriteTime")
|
||||
private Date writeTime;
|
||||
|
||||
@Excel(name = "读取时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Schema(description = "读取时间")
|
||||
@TableField("ReadTime")
|
||||
private Date readTime;
|
||||
|
||||
@Excel(name = "交互标识", width = 10)
|
||||
@Schema(description = "交互标识")
|
||||
@TableField("MES_Flag")
|
||||
private Integer mesFlag;
|
||||
}
|
||||
@@ -0,0 +1,177 @@
|
||||
package org.jeecg.modules.xslmes.mcs.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
/**
|
||||
* @Description: MES下发混炼计划
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("MESToMCS_MixPlan")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@Schema(description = "MES下发混炼计划")
|
||||
public class MesToMcsMixPlan implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId(value = "GUID", type = IdType.INPUT)
|
||||
@Schema(description = "GUID")
|
||||
private String guid;
|
||||
|
||||
@Excel(name = "计划编号", width = 20)
|
||||
@Schema(description = "计划编号")
|
||||
@TableField("PlanId")
|
||||
private String planId;
|
||||
|
||||
@Excel(name = "计划来源", width = 10)
|
||||
@Schema(description = "计划来源")
|
||||
@TableField("PlanSource")
|
||||
private String planSource;
|
||||
|
||||
@Excel(name = "机台编号", width = 15)
|
||||
@Schema(description = "机台编号")
|
||||
@TableField("EquipId")
|
||||
private String equipId;
|
||||
|
||||
@Excel(name = "机台名称", width = 15)
|
||||
@Schema(description = "机台名称")
|
||||
@TableField("EquipName")
|
||||
private String equipName;
|
||||
|
||||
@Excel(name = "机台类型", width = 15)
|
||||
@Schema(description = "机台类型")
|
||||
@TableField("EquipType")
|
||||
private String equipType;
|
||||
|
||||
@Excel(name = "计划日期", width = 15)
|
||||
@Schema(description = "计划日期")
|
||||
@TableField("PlanDate")
|
||||
private String planDate;
|
||||
|
||||
@Excel(name = "班次", width = 8)
|
||||
@Schema(description = "班次：1=Night 2=Morning 3=Noon")
|
||||
@TableField("ShiftId")
|
||||
private String shiftId;
|
||||
|
||||
@Excel(name = "班组", width = 8)
|
||||
@Schema(description = "班组：1=A 2=B 3=C 4=D")
|
||||
@TableField("ShiftClass")
|
||||
private String shiftClass;
|
||||
|
||||
@Excel(name = "计划顺序", width = 10)
|
||||
@Schema(description = "计划顺序")
|
||||
@TableField("WorkOrder")
|
||||
private Integer workOrder;
|
||||
|
||||
@Excel(name = "配方代码", width = 20)
|
||||
@Schema(description = "配方代码")
|
||||
@TableField("RecipCode")
|
||||
private String recipCode;
|
||||
|
||||
@Excel(name = "配方名称", width = 20)
|
||||
@Schema(description = "配方名称")
|
||||
@TableField("RecipName")
|
||||
private String recipName;
|
||||
|
||||
@Excel(name = "物料代码", width = 20)
|
||||
@Schema(description = "物料代码")
|
||||
@TableField("MaterCode")
|
||||
private String materCode;
|
||||
|
||||
@Excel(name = "物料名称", width = 30)
|
||||
@Schema(description = "物料名称")
|
||||
@TableField("MaterName")
|
||||
private String materName;
|
||||
|
||||
@Excel(name = "工单号", width = 20)
|
||||
@Schema(description = "工单号")
|
||||
@TableField("MOCode")
|
||||
private String moCode;
|
||||
|
||||
@Excel(name = "配方版本", width = 10)
|
||||
@Schema(description = "配方版本")
|
||||
@TableField("RcipVersion")
|
||||
private Integer rcipVersion;
|
||||
|
||||
@Excel(name = "配方类型", width = 10)
|
||||
@Schema(description = "配方类型：1=正式 2=试验")
|
||||
@TableField("ProType")
|
||||
private Integer proType;
|
||||
|
||||
@Excel(name = "计划车次", width = 10)
|
||||
@Schema(description = "计划车次")
|
||||
@TableField("SetNum")
|
||||
private Integer setNum;
|
||||
|
||||
@Excel(name = "完成车次", width = 10)
|
||||
@Schema(description = "完成车次")
|
||||
@TableField("DoneNum")
|
||||
private Integer doneNum;
|
||||
|
||||
@Excel(name = "计划状态", width = 10)
|
||||
@Schema(description = "计划状态")
|
||||
@TableField("PlanState")
|
||||
private Integer planState;
|
||||
|
||||
@Excel(name = "MES计划变化", width = 12)
|
||||
@Schema(description = "MES计划变化")
|
||||
@TableField("MESPlanChange")
|
||||
private Integer mesPlanChange;
|
||||
|
||||
@Excel(name = "MCS更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Schema(description = "MCS更新时间")
|
||||
@TableField("MCSUpdateTime")
|
||||
private Date mcsUpdateTime;
|
||||
|
||||
@Excel(name = "MCS计划变化", width = 12)
|
||||
@Schema(description = "MCS计划变化")
|
||||
@TableField("MCSPlanChange")
|
||||
private Integer mcsPlanChange;
|
||||
|
||||
@Excel(name = "MES更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Schema(description = "MES更新时间")
|
||||
@TableField("MESUPdateTime")
|
||||
private Date mesUpdateTime;
|
||||
|
||||
@Excel(name = "写入时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Schema(description = "写入时间")
|
||||
@TableField("WriteTime")
|
||||
private Date writeTime;
|
||||
|
||||
@Excel(name = "读取时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Schema(description = "读取时间")
|
||||
@TableField("ReadTime")
|
||||
private Date readTime;
|
||||
|
||||
@Excel(name = "交互标识", width = 10)
|
||||
@Schema(description = "交互标识")
|
||||
@TableField("MES_Flag")
|
||||
private Integer mesFlag;
|
||||
|
||||
@Excel(name = "备注", width = 30)
|
||||
@Schema(description = "备注")
|
||||
@TableField("Remark")
|
||||
private String remark;
|
||||
}
|
||||
@@ -0,0 +1,244 @@
|
||||
package org.jeecg.modules.xslmes.mcs.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
import java.math.BigDecimal;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
/**
|
||||
* @Description: MES下发配方
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("MESToMCS_Recipe")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@Schema(description = "MES下发配方")
|
||||
public class MesToMcsRecipe implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId(value = "GUID", type = IdType.INPUT)
|
||||
@Schema(description = "GUID")
|
||||
private String guid;
|
||||
|
||||
@Excel(name = "机台编号", width = 15)
|
||||
@Schema(description = "机台编号")
|
||||
@TableField("EquipId")
|
||||
private String equipId;
|
||||
|
||||
@Excel(name = "机台名称", width = 15)
|
||||
@Schema(description = "机台名称")
|
||||
@TableField("EquipName")
|
||||
private String equipName;
|
||||
|
||||
@Excel(name = "机台类型", width = 15)
|
||||
@Schema(description = "机台类型")
|
||||
@TableField("EquipType")
|
||||
private String equipType;
|
||||
|
||||
@Excel(name = "配方代码", width = 20)
|
||||
@Schema(description = "配方代码")
|
||||
@TableField("RecipCode")
|
||||
private String recipCode;
|
||||
|
||||
@Excel(name = "配方名称", width = 20)
|
||||
@Schema(description = "配方名称")
|
||||
@TableField("RecipName")
|
||||
private String recipName;
|
||||
|
||||
@Excel(name = "配方版本", width = 10)
|
||||
@Schema(description = "配方版本")
|
||||
@TableField("RecipVersion")
|
||||
private Integer recipVersion;
|
||||
|
||||
@Excel(name = "配方类型", width = 10)
|
||||
@Schema(description = "配方类型：1=正式 2=试验")
|
||||
@TableField("ProType")
|
||||
private Integer proType;
|
||||
|
||||
@Excel(name = "是否使用", width = 10)
|
||||
@Schema(description = "是否使用：1=使用 0=停用")
|
||||
@TableField("IsUse")
|
||||
private Integer isUse;
|
||||
|
||||
@Excel(name = "总重", width = 10)
|
||||
@Schema(description = "总重")
|
||||
@TableField("Weight")
|
||||
private BigDecimal weight;
|
||||
|
||||
@Excel(name = "炭黑重量", width = 10)
|
||||
@Schema(description = "炭黑重量")
|
||||
@TableField("THWeight")
|
||||
private BigDecimal thWeight;
|
||||
|
||||
@Excel(name = "油料重量", width = 10)
|
||||
@Schema(description = "油料重量")
|
||||
@TableField("YLWeight")
|
||||
private BigDecimal ylWeight;
|
||||
|
||||
@Excel(name = "粉料重量", width = 10)
|
||||
@Schema(description = "粉料重量")
|
||||
@TableField("FLWeight")
|
||||
private BigDecimal flWeight;
|
||||
|
||||
@Excel(name = "大粉料重量", width = 12)
|
||||
@Schema(description = "大粉料重量")
|
||||
@TableField("DFLWeight")
|
||||
private BigDecimal dflWeight;
|
||||
|
||||
@Excel(name = "胶料重量", width = 10)
|
||||
@Schema(description = "胶料重量")
|
||||
@TableField("GWWeight")
|
||||
private BigDecimal gwWeight;
|
||||
|
||||
@Excel(name = "小料重量", width = 10)
|
||||
@Schema(description = "小料重量")
|
||||
@TableField("JLWeight")
|
||||
private BigDecimal jlWeight;
|
||||
|
||||
@Excel(name = "炭黑回收方式1", width = 14)
|
||||
@Schema(description = "炭黑回收方式：0=回收 1=时间回收 2=重量回收")
|
||||
@TableField("Dust1RecycleMode")
|
||||
private Integer dust1RecycleMode;
|
||||
|
||||
@Excel(name = "炭黑回收参数1", width = 14)
|
||||
@Schema(description = "炭黑回收参数1")
|
||||
@TableField("Dust1RecycleVal")
|
||||
private Integer dust1RecycleVal;
|
||||
|
||||
@Excel(name = "炭黑回收方式2", width = 14)
|
||||
@Schema(description = "炭黑回收方式2")
|
||||
@TableField("Dust2RecycleMode")
|
||||
private Integer dust2RecycleMode;
|
||||
|
||||
@Excel(name = "炭黑回收参数2", width = 14)
|
||||
@Schema(description = "炭黑回收参数2")
|
||||
@TableField("Dust2RecycleVal")
|
||||
private Integer dust2RecycleVal;
|
||||
|
||||
@Excel(name = "超时排胶最短时间", width = 16)
|
||||
@Schema(description = "超时排胶最短时间")
|
||||
@TableField("SetOverTimVal")
|
||||
private Integer setOverTimVal;
|
||||
|
||||
@Excel(name = "设定内超温值", width = 14)
|
||||
@Schema(description = "设定内超温值")
|
||||
@TableField("SetInOverTempVal")
|
||||
private Integer setInOverTempVal;
|
||||
|
||||
@Excel(name = "超温排胶温度", width = 14)
|
||||
@Schema(description = "超温排胶温度")
|
||||
@TableField("SetOverTempVal")
|
||||
private Integer setOverTempVal;
|
||||
|
||||
@Excel(name = "超时排胶时间", width = 14)
|
||||
@Schema(description = "超时排胶时间")
|
||||
@TableField("SetOverTimeVal")
|
||||
private Integer setOverTimeVal;
|
||||
|
||||
@Excel(name = "备用转速设定", width = 14)
|
||||
@Schema(description = "备用转速设定")
|
||||
@TableField("FeedRotorSetSpd")
|
||||
private Integer feedRotorSetSpd;
|
||||
|
||||
@Excel(name = "备用转速误差", width = 14)
|
||||
@Schema(description = "备用转速误差")
|
||||
@TableField("FeedRotorSetTol")
|
||||
private Integer feedRotorSetTol;
|
||||
|
||||
@Excel(name = "混炼室温度", width = 12)
|
||||
@Schema(description = "混炼室温度")
|
||||
@TableField("SetTCU1")
|
||||
private Integer setTcu1;
|
||||
|
||||
@Excel(name = "转子温度", width = 12)
|
||||
@Schema(description = "转子温度")
|
||||
@TableField("SetTCU2")
|
||||
private Integer setTcu2;
|
||||
|
||||
@Excel(name = "卸料门温度", width = 12)
|
||||
@Schema(description = "卸料门温度")
|
||||
@TableField("SetTCU3")
|
||||
private Integer setTcu3;
|
||||
|
||||
@Excel(name = "备用TCU4", width = 12)
|
||||
@Schema(description = "备用")
|
||||
@TableField("SetTCU4")
|
||||
private Integer setTcu4;
|
||||
|
||||
@Excel(name = "备用TCU5", width = 12)
|
||||
@Schema(description = "备用")
|
||||
@TableField("SetTCU5")
|
||||
private Integer setTcu5;
|
||||
|
||||
@Excel(name = "最大转速", width = 12)
|
||||
@Schema(description = "最大转速")
|
||||
@TableField("CBTempVal")
|
||||
private Integer cbTempVal;
|
||||
|
||||
@Excel(name = "最小转速", width = 12)
|
||||
@Schema(description = "最小转速")
|
||||
@TableField("ZZTempVal")
|
||||
private Integer zzTempVal;
|
||||
|
||||
@Excel(name = "XLMTempVal", width = 12)
|
||||
@Schema(description = "XLMTempVal")
|
||||
@TableField("XLMTempVal")
|
||||
private Integer xlmTempVal;
|
||||
|
||||
@Excel(name = "写入时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Schema(description = "写入时间")
|
||||
@TableField("WriteTime")
|
||||
private Date writeTime;
|
||||
|
||||
@Excel(name = "读取时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Schema(description = "读取时间")
|
||||
@TableField("ReadTime")
|
||||
private Date readTime;
|
||||
|
||||
@Excel(name = "交互标识", width = 10)
|
||||
@Schema(description = "交互标识")
|
||||
@TableField("MES_Flag")
|
||||
private Integer mesFlag;
|
||||
|
||||
@Excel(name = "备注", width = 25)
|
||||
@Schema(description = "备注")
|
||||
@TableField("Remark")
|
||||
private String remark;
|
||||
|
||||
@Excel(name = "架子车数", width = 10)
|
||||
@Schema(description = "架子车数")
|
||||
@TableField("ShelfLotCount")
|
||||
private Integer shelfLotCount;
|
||||
|
||||
@Excel(name = "YP名称", width = 20)
|
||||
@Schema(description = "YP名称")
|
||||
@TableField("YPName")
|
||||
private String ypName;
|
||||
|
||||
@Excel(name = "YP重量", width = 10)
|
||||
@Schema(description = "YP重量")
|
||||
@TableField("YPWeight")
|
||||
private BigDecimal ypWeight;
|
||||
|
||||
@Excel(name = "YP误差", width = 10)
|
||||
@Schema(description = "YP误差")
|
||||
@TableField("YPError")
|
||||
private BigDecimal ypError;
|
||||
}
|
||||
@@ -0,0 +1,159 @@
|
||||
package org.jeecg.modules.xslmes.mcs.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
import java.math.BigDecimal;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
/**
|
||||
* @Description: MES下发配方步序
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("MESToMCS_Recipe_MixStep")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@Schema(description = "MES下发配方步序")
|
||||
public class MesToMcsRecipeMixStep implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId(value = "GUID", type = IdType.ASSIGN_ID)
|
||||
@Schema(description = "主键")
|
||||
private String guid;
|
||||
|
||||
@Excel(name = "机台编号", width = 15)
|
||||
@Schema(description = "机台编号")
|
||||
@TableField("EquipId")
|
||||
private String equipId;
|
||||
|
||||
@Excel(name = "机台名称", width = 15)
|
||||
@Schema(description = "机台名称")
|
||||
@TableField("EquipName")
|
||||
private String equipName;
|
||||
|
||||
@Excel(name = "机台类型", width = 15)
|
||||
@Schema(description = "机台类型")
|
||||
@TableField("EquipType")
|
||||
private String equipType;
|
||||
|
||||
@Excel(name = "配方代码", width = 20)
|
||||
@Schema(description = "配方代码")
|
||||
@TableField("RecipCode")
|
||||
private String recipCode;
|
||||
|
||||
@Excel(name = "序号", width = 10)
|
||||
@Schema(description = "序号")
|
||||
@TableField("Serial")
|
||||
private Integer serial;
|
||||
|
||||
@Excel(name = "动作地址", width = 10)
|
||||
@Schema(description = "动作地址")
|
||||
@TableField("Act")
|
||||
private Integer act;
|
||||
|
||||
@Excel(name = "动作名称", width = 20)
|
||||
@Schema(description = "动作名称")
|
||||
@TableField("Action")
|
||||
private String action;
|
||||
|
||||
@Excel(name = "条件地址", width = 10)
|
||||
@Schema(description = "条件地址")
|
||||
@TableField("Cond")
|
||||
private Integer cond;
|
||||
|
||||
@Excel(name = "条件名称", width = 20)
|
||||
@Schema(description = "条件名称")
|
||||
@TableField("Condition")
|
||||
private String condition;
|
||||
|
||||
@Excel(name = "时间(秒)", width = 10)
|
||||
@Schema(description = "时间（秒）")
|
||||
@TableField("Time")
|
||||
private Integer time;
|
||||
|
||||
@Excel(name = "时间限制", width = 10)
|
||||
@Schema(description = "时间限制")
|
||||
@TableField("TimeLimit")
|
||||
private Integer timeLimit;
|
||||
|
||||
@Excel(name = "温度(度)", width = 10)
|
||||
@Schema(description = "温度（度）")
|
||||
@TableField("Temp")
|
||||
private BigDecimal temp;
|
||||
|
||||
@Excel(name = "温度限制", width = 10)
|
||||
@Schema(description = "温度限制")
|
||||
@TableField("TempLimit")
|
||||
private BigDecimal tempLimit;
|
||||
|
||||
@Excel(name = "能量(kWh)", width = 12)
|
||||
@Schema(description = "能量（kWh）")
|
||||
@TableField("Energy")
|
||||
private BigDecimal energy;
|
||||
|
||||
@Excel(name = "能量限制", width = 10)
|
||||
@Schema(description = "能量限制")
|
||||
@TableField("EnergyLimit")
|
||||
private BigDecimal energyLimit;
|
||||
|
||||
@Excel(name = "功率(W)", width = 10)
|
||||
@Schema(description = "功率（W）")
|
||||
@TableField("Power")
|
||||
private BigDecimal power;
|
||||
|
||||
@Excel(name = "功率限制", width = 10)
|
||||
@Schema(description = "功率限制")
|
||||
@TableField("PowerLimit")
|
||||
private BigDecimal powerLimit;
|
||||
|
||||
@Excel(name = "压力(10kp)", width = 12)
|
||||
@Schema(description = "压力（10kp）")
|
||||
@TableField("Press")
|
||||
private BigDecimal press;
|
||||
|
||||
@Excel(name = "转速(rpm)", width = 10)
|
||||
@Schema(description = "转速（rpm）")
|
||||
@TableField("Speed")
|
||||
private BigDecimal speed;
|
||||
|
||||
@Excel(name = "转子间隙", width = 10)
|
||||
@Schema(description = "转子间隙")
|
||||
@TableField("RotorGap")
|
||||
private BigDecimal rotorGap;
|
||||
|
||||
@Excel(name = "栓位置", width = 10)
|
||||
@Schema(description = "栓位置")
|
||||
@TableField("RamPos")
|
||||
private BigDecimal ramPos;
|
||||
|
||||
@Excel(name = "写入时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Schema(description = "写入时间")
|
||||
@TableField("WriteTime")
|
||||
private Date writeTime;
|
||||
|
||||
@Excel(name = "读取时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Schema(description = "读取时间")
|
||||
@TableField("ReadTime")
|
||||
private Date readTime;
|
||||
|
||||
@Excel(name = "交互标识", width = 10)
|
||||
@Schema(description = "交互标识")
|
||||
@TableField("MES_Flag")
|
||||
private Integer mesFlag;
|
||||
}
|
||||
@@ -0,0 +1,134 @@
|
||||
package org.jeecg.modules.xslmes.mcs.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
import java.math.BigDecimal;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
/**
|
||||
* @Description: MES下发配方称量
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("MESToMCS_Recipe_Weight")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@Schema(description = "MES下发配方称量")
|
||||
public class MesToMcsRecipeWeight implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId(value = "GUID", type = IdType.ASSIGN_ID)
|
||||
@Schema(description = "主键")
|
||||
private String guid;
|
||||
|
||||
@Excel(name = "机台编号", width = 15)
|
||||
@Schema(description = "机台编号")
|
||||
@TableField("EquipId")
|
||||
private String equipId;
|
||||
|
||||
@Excel(name = "机台名称", width = 15)
|
||||
@Schema(description = "机台名称")
|
||||
@TableField("EquipName")
|
||||
private String equipName;
|
||||
|
||||
@Excel(name = "机台类型", width = 15)
|
||||
@Schema(description = "机台类型")
|
||||
@TableField("EquipType")
|
||||
private String equipType;
|
||||
|
||||
@Excel(name = "配方代码", width = 20)
|
||||
@Schema(description = "配方代码")
|
||||
@TableField("RecipCode")
|
||||
private String recipCode;
|
||||
|
||||
@Excel(name = "秤类型", width = 10)
|
||||
@Schema(description = "秤类型")
|
||||
@TableField("ScaleType")
|
||||
private Integer scaleType;
|
||||
|
||||
@Excel(name = "秤编号", width = 10)
|
||||
@Schema(description = "秤编号")
|
||||
@TableField("ScaleId")
|
||||
private Integer scaleId;
|
||||
|
||||
@Excel(name = "序号", width = 10)
|
||||
@Schema(description = "序号")
|
||||
@TableField("Serial")
|
||||
private Integer serial;
|
||||
|
||||
@Excel(name = "动作", width = 10)
|
||||
@Schema(description = "动作：1=称量 2=称到 3=卸料 0=默认")
|
||||
@TableField("Action")
|
||||
private Integer action;
|
||||
|
||||
@Excel(name = "料仓编号", width = 10)
|
||||
@Schema(description = "料仓编号")
|
||||
@TableField("BinNo")
|
||||
private Integer binNo;
|
||||
|
||||
@Excel(name = "物料代码", width = 25)
|
||||
@Schema(description = "物料代码")
|
||||
@TableField("MatCode")
|
||||
private String matCode;
|
||||
|
||||
@Excel(name = "物料名称", width = 25)
|
||||
@Schema(description = "物料名称")
|
||||
@TableField("MatName")
|
||||
private String matName;
|
||||
|
||||
@Excel(name = "设定重量", width = 12)
|
||||
@Schema(description = "设定重量")
|
||||
@TableField("SetWeight")
|
||||
private BigDecimal setWeight;
|
||||
|
||||
@Excel(name = "误差重量", width = 12)
|
||||
@Schema(description = "误差重量")
|
||||
@TableField("Tolerance")
|
||||
private BigDecimal tolerance;
|
||||
|
||||
@Excel(name = "导切机编号", width = 12)
|
||||
@Schema(description = "导切机编号")
|
||||
@TableField("SFNum")
|
||||
private Integer sfNum;
|
||||
|
||||
@Excel(name = "物料类型", width = 15)
|
||||
@Schema(description = "物料类型")
|
||||
@TableField("MatType")
|
||||
private String matType;
|
||||
|
||||
@Excel(name = "写入时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Schema(description = "写入时间")
|
||||
@TableField("WriteTime")
|
||||
private Date writeTime;
|
||||
|
||||
@Excel(name = "读取时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Schema(description = "读取时间")
|
||||
@TableField("ReadTime")
|
||||
private Date readTime;
|
||||
|
||||
@Excel(name = "交互标识", width = 10)
|
||||
@Schema(description = "交互标识：0=MES写入 1=上辅机读取")
|
||||
@TableField("MES_Flag")
|
||||
private Integer mesFlag;
|
||||
|
||||
@Excel(name = "备注", width = 25)
|
||||
@Schema(description = "备注")
|
||||
@TableField("Remark")
|
||||
private String remark;
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package org.jeecg.modules.xslmes.mcs.mapper;
|
||||
|
||||
import org.jeecg.modules.xslmes.mcs.entity.McsToMesAlarm;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
|
||||
/**
|
||||
* @Description: 上辅机报警记录
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
*/
|
||||
public interface McsToMesAlarmMapper extends BaseMapper<McsToMesAlarm> {
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package org.jeecg.modules.xslmes.mcs.mapper;
|
||||
|
||||
import org.jeecg.modules.xslmes.mcs.entity.McsToMesAutoXlLog;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
|
||||
/**
|
||||
* @Description: 自动卸料日志
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
*/
|
||||
public interface McsToMesAutoXlLogMapper extends BaseMapper<McsToMesAutoXlLog> {
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package org.jeecg.modules.xslmes.mcs.mapper;
|
||||
|
||||
import org.jeecg.modules.xslmes.mcs.entity.McsToMesBinToMater;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
|
||||
/**
|
||||
* @Description: 料仓物料对应
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
*/
|
||||
public interface McsToMesBinToMaterMapper extends BaseMapper<McsToMesBinToMater> {
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package org.jeecg.modules.xslmes.mcs.mapper;
|
||||
|
||||
import org.jeecg.modules.xslmes.mcs.entity.McsToMesCheckScaleLog;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
|
||||
/**
|
||||
* @Description: 称量校验日志
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
*/
|
||||
public interface McsToMesCheckScaleLogMapper extends BaseMapper<McsToMesCheckScaleLog> {
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package org.jeecg.modules.xslmes.mcs.mapper;
|
||||
|
||||
import org.jeecg.modules.xslmes.mcs.entity.McsToMesMixAct;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
|
||||
/**
|
||||
* @Description: 密炼机动作状态
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
*/
|
||||
public interface McsToMesMixActMapper extends BaseMapper<McsToMesMixAct> {
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package org.jeecg.modules.xslmes.mcs.mapper;
|
||||
|
||||
import org.jeecg.modules.xslmes.mcs.entity.McsToMesMixAlarm;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
|
||||
/**
|
||||
* @Description: 密炼机报警记录
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
*/
|
||||
public interface McsToMesMixAlarmMapper extends BaseMapper<McsToMesMixAlarm> {
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package org.jeecg.modules.xslmes.mcs.mapper;
|
||||
|
||||
import org.jeecg.modules.xslmes.mcs.entity.McsToMesMixBatch;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
|
||||
/**
|
||||
* @Description: 密炼批次数据
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
*/
|
||||
public interface McsToMesMixBatchMapper extends BaseMapper<McsToMesMixBatch> {
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package org.jeecg.modules.xslmes.mcs.mapper;
|
||||
|
||||
import org.jeecg.modules.xslmes.mcs.entity.McsToMesMixCon;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
|
||||
/**
|
||||
* @Description: 密炼机控制参数
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
*/
|
||||
public interface McsToMesMixConMapper extends BaseMapper<McsToMesMixCon> {
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package org.jeecg.modules.xslmes.mcs.mapper;
|
||||
|
||||
import org.jeecg.modules.xslmes.mcs.entity.McsToMesMixCurve;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
|
||||
/**
|
||||
* @Description: 密炼过程曲线
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
*/
|
||||
public interface McsToMesMixCurveMapper extends BaseMapper<McsToMesMixCurve> {
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package org.jeecg.modules.xslmes.mcs.mapper;
|
||||
|
||||
import org.jeecg.modules.xslmes.mcs.entity.McsToMesMixExePlan;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
|
||||
/**
|
||||
* @Description: 密炼执行计划
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
*/
|
||||
public interface McsToMesMixExePlanMapper extends BaseMapper<McsToMesMixExePlan> {
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package org.jeecg.modules.xslmes.mcs.mapper;
|
||||
|
||||
import org.jeecg.modules.xslmes.mcs.entity.McsToMesMixStep;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
|
||||
/**
|
||||
* @Description: 密炼步序数据
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
*/
|
||||
public interface McsToMesMixStepMapper extends BaseMapper<McsToMesMixStep> {
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package org.jeecg.modules.xslmes.mcs.mapper;
|
||||
|
||||
import org.jeecg.modules.xslmes.mcs.entity.McsToMesMixWeight;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
|
||||
/**
|
||||
* @Description: 密炼物料称量
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
*/
|
||||
public interface McsToMesMixWeightMapper extends BaseMapper<McsToMesMixWeight> {
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package org.jeecg.modules.xslmes.mcs.mapper;
|
||||
|
||||
import org.jeecg.modules.xslmes.mcs.entity.MesToMcsMaterial;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
|
||||
/**
|
||||
* @Description: MES下发物料
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
*/
|
||||
public interface MesToMcsMaterialMapper extends BaseMapper<MesToMcsMaterial> {
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package org.jeecg.modules.xslmes.mcs.mapper;
|
||||
|
||||
import org.jeecg.modules.xslmes.mcs.entity.MesToMcsMixPlan;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
|
||||
/**
|
||||
* @Description: MES下发混炼计划
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
*/
|
||||
public interface MesToMcsMixPlanMapper extends BaseMapper<MesToMcsMixPlan> {
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package org.jeecg.modules.xslmes.mcs.mapper;
|
||||
|
||||
import org.jeecg.modules.xslmes.mcs.entity.MesToMcsRecipe;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
|
||||
/**
|
||||
* @Description: MES下发配方
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
*/
|
||||
public interface MesToMcsRecipeMapper extends BaseMapper<MesToMcsRecipe> {
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package org.jeecg.modules.xslmes.mcs.mapper;
|
||||
|
||||
import org.jeecg.modules.xslmes.mcs.entity.MesToMcsRecipeMixStep;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
|
||||
/**
|
||||
* @Description: MES下发配方步序
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
*/
|
||||
public interface MesToMcsRecipeMixStepMapper extends BaseMapper<MesToMcsRecipeMixStep> {
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package org.jeecg.modules.xslmes.mcs.mapper;
|
||||
|
||||
import org.jeecg.modules.xslmes.mcs.entity.MesToMcsRecipeWeight;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
|
||||
/**
|
||||
* @Description: MES下发配方称量
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
*/
|
||||
public interface MesToMcsRecipeWeightMapper extends BaseMapper<MesToMcsRecipeWeight> {
|
||||
}
|
||||
@@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.jeecg.modules.xslmes.mcs.mapper.McsToMesAlarmMapper">
|
||||
</mapper>
|
||||
@@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.jeecg.modules.xslmes.mcs.mapper.McsToMesAutoXlLogMapper">
|
||||
</mapper>
|
||||
@@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.jeecg.modules.xslmes.mcs.mapper.McsToMesBinToMaterMapper">
|
||||
</mapper>
|
||||
@@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.jeecg.modules.xslmes.mcs.mapper.McsToMesCheckScaleLogMapper">
|
||||
</mapper>
|
||||
@@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.jeecg.modules.xslmes.mcs.mapper.McsToMesMixActMapper">
|
||||
</mapper>
|
||||
@@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.jeecg.modules.xslmes.mcs.mapper.McsToMesMixAlarmMapper">
|
||||
</mapper>
|
||||
@@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.jeecg.modules.xslmes.mcs.mapper.McsToMesMixBatchMapper">
|
||||
</mapper>
|
||||
@@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.jeecg.modules.xslmes.mcs.mapper.McsToMesMixConMapper">
|
||||
</mapper>
|
||||
@@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.jeecg.modules.xslmes.mcs.mapper.McsToMesMixCurveMapper">
|
||||
</mapper>
|
||||
@@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.jeecg.modules.xslmes.mcs.mapper.McsToMesMixExePlanMapper">
|
||||
</mapper>
|
||||
@@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.jeecg.modules.xslmes.mcs.mapper.McsToMesMixStepMapper">
|
||||
</mapper>
|
||||
@@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.jeecg.modules.xslmes.mcs.mapper.McsToMesMixWeightMapper">
|
||||
</mapper>
|
||||
@@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.jeecg.modules.xslmes.mcs.mapper.MesToMcsMaterialMapper">
|
||||
</mapper>
|
||||
@@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.jeecg.modules.xslmes.mcs.mapper.MesToMcsMixPlanMapper">
|
||||
</mapper>
|
||||
@@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.jeecg.modules.xslmes.mcs.mapper.MesToMcsRecipeMapper">
|
||||
</mapper>
|
||||
@@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.jeecg.modules.xslmes.mcs.mapper.MesToMcsRecipeMixStepMapper">
|
||||
</mapper>
|
||||
@@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.jeecg.modules.xslmes.mcs.mapper.MesToMcsRecipeWeightMapper">
|
||||
</mapper>
|
||||
@@ -0,0 +1,12 @@
|
||||
package org.jeecg.modules.xslmes.mcs.service;
|
||||
|
||||
import org.jeecg.modules.xslmes.mcs.entity.McsToMesAlarm;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
|
||||
/**
|
||||
* @Description: 上辅机报警记录
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
*/
|
||||
public interface IMcsToMesAlarmService extends IService<McsToMesAlarm> {
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package org.jeecg.modules.xslmes.mcs.service;
|
||||
|
||||
import org.jeecg.modules.xslmes.mcs.entity.McsToMesAutoXlLog;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
|
||||
/**
|
||||
* @Description: 自动卸料日志
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
*/
|
||||
public interface IMcsToMesAutoXlLogService extends IService<McsToMesAutoXlLog> {
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package org.jeecg.modules.xslmes.mcs.service;
|
||||
|
||||
import org.jeecg.modules.xslmes.mcs.entity.McsToMesBinToMater;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
|
||||
/**
|
||||
* @Description: 料仓物料对应
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2026-06-02
|
||||
*/
|
||||
public interface IMcsToMesBinToMaterService extends IService<McsToMesBinToMater> {
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user