Explorar o código

新增pda模块,需执行
mes_device_time_intercept.sql
mes_icons_cz060.sql
这两个sql文件,不分先后

hbx hai 1 semana
pai
achega
5fc10a10d7
Modificáronse 2 ficheiros con 89 adicións e 0 borrados
  1. 15 0
      db/mes_device_time_intercept.sql
  2. 74 0
      db/mes_icons_cz060.sql

+ 15 - 0
db/mes_device_time_intercept.sql

@@ -0,0 +1,15 @@
+-- 工位生产拦截表(代码 MesDeviceTimeInterceptService 在过站校验失败时写入,缺失会导致接口 500)
+-- 数据库:MySQL(mes_cloud_xz),所有环境(含 192.168.1.150 部署库)都需执行
+CREATE TABLE IF NOT EXISTS mes_device_time_intercept (
+  id          varchar(64)  NOT NULL COMMENT 'id',
+  sn          varchar(50)  DEFAULT NULL COMMENT '工件码',
+  line_sn     varchar(20)  DEFAULT NULL COMMENT '产线编号',
+  oprno       varchar(50)  DEFAULT NULL COMMENT '工序号',
+  cate        varchar(10)  DEFAULT NULL COMMENT '拦截类型',
+  content     varchar(255) DEFAULT NULL COMMENT '拦截原因',
+  create_by   varchar(64)  DEFAULT NULL COMMENT '创建人',
+  create_date datetime     NOT NULL COMMENT '拦截时间',
+  update_by   varchar(64)  DEFAULT NULL COMMENT '更新人',
+  update_date datetime     DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (id, create_date)
+) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COMMENT = '工位生产拦截';

+ 74 - 0
db/mes_icons_cz060.sql

@@ -0,0 +1,74 @@
+-- 功能模块新增:鑫政 CZ060 新线 PDA 过站模块(安卓端 case 100~117)
+-- 数据库:MySQL(mes_cloud_xz),执行后即生效,无需重启服务
+-- 说明:
+--   1. title 只存中文工序名,oprno 等信息由安卓端按 mode 硬编码,故 OP 信息记入 remark 备查
+--   2. auth 为 PDA 图标显示权限串(/js/a/mes/mesIcons/icons 按 subject.isPermitted(auth) 过滤)
+-- 排查:如需与现有过站图标权限保持一致,先执行下面这句查看现有 auth 值,然后修改 @pda_auth 后再执行插入
+--   SELECT mode, title, auth FROM mes_icons WHERE status = '0' ORDER BY CAST(mode AS UNSIGNED);
+
+SET @pda_auth = 'mes:pda:cz060'; -- 如 PDA 角色已有现成权限串,改成查到的值即可
+
+INSERT INTO mes_icons (id, title, mode, remark, status, auth, create_by, create_date, update_by, update_date)
+VALUES ('cz060_icon_100', '封板预装+点焊', '100', 'CZ060-OP65(PDA过站)', '0', @pda_auth, 'system', NOW(), 'system', NOW());
+INSERT INTO mes_icons (id, title, mode, remark, status, auth, create_by, create_date, update_by, update_date)
+VALUES ('cz060_icon_101', '打磨', '101', 'CZ060-OP90(PDA过站)', '0', @pda_auth, 'system', NOW(), 'system', NOW());
+INSERT INTO mes_icons (id, title, mode, remark, status, auth, create_by, create_date, update_by, update_date)
+VALUES ('cz060_icon_102', '后膨胀梁打码', '102', 'CZ060-OP105(PDA过站)', '0', @pda_auth, 'system', NOW(), 'system', NOW());
+INSERT INTO mes_icons (id, title, mode, remark, status, auth, create_by, create_date, update_by, update_date)
+VALUES ('cz060_icon_103', '打磨', '103', 'CZ060-OP125(PDA过站)', '0', @pda_auth, 'system', NOW(), 'system', NOW());
+INSERT INTO mes_icons (id, title, mode, remark, status, auth, create_by, create_date, update_by, update_date)
+VALUES ('cz060_icon_104', '吹铝屑+刮毛刺+清洁', '104', 'CZ060-OP140(PDA过站)', '0', @pda_auth, 'system', NOW(), 'system', NOW());
+INSERT INTO mes_icons (id, title, mode, remark, status, auth, create_by, create_date, update_by, update_date)
+VALUES ('cz060_icon_105', '人工清洁', '105', 'CZ060-OP155(PDA过站)', '0', @pda_auth, 'system', NOW(), 'system', NOW());
+INSERT INTO mes_icons (id, title, mode, remark, status, auth, create_by, create_date, update_by, update_date)
+VALUES ('cz060_icon_106', '抽芯拉铆', '106', 'CZ060-OP160(PDA过站)', '0', @pda_auth, 'system', NOW(), 'system', NOW());
+INSERT INTO mes_icons (id, title, mode, remark, status, auth, create_by, create_date, update_by, update_date)
+VALUES ('cz060_icon_107', '检具', '107', 'CZ060-OP185(PDA过站)', '0', @pda_auth, 'system', NOW(), 'system', NOW());
+INSERT INTO mes_icons (id, title, mode, remark, status, auth, create_by, create_date, update_by, update_date)
+VALUES ('cz060_icon_108', '白件GP12', '108', 'CZ060-OP190(PDA过站)', '0', @pda_auth, 'system', NOW(), 'system', NOW());
+INSERT INTO mes_icons (id, title, mode, remark, status, auth, create_by, create_date, update_by, update_date)
+VALUES ('cz060_icon_109', '喷粉前打包', '109', 'CZ060-OP195(PDA过站)', '0', @pda_auth, 'system', NOW(), 'system', NOW());
+INSERT INTO mes_icons (id, title, mode, remark, status, auth, create_by, create_date, update_by, update_date)
+VALUES ('cz060_icon_110', '总成清洁', '110', 'CZ060-OP220(PDA过站)', '0', @pda_auth, 'system', NOW(), 'system', NOW());
+INSERT INTO mes_icons (id, title, mode, remark, status, auth, create_by, create_date, update_by, update_date)
+VALUES ('cz060_icon_111', '支架、定位销安装', '111', 'CZ060-OP225(PDA过站)', '0', @pda_auth, 'system', NOW(), 'system', NOW());
+INSERT INTO mes_icons (id, title, mode, remark, status, auth, create_by, create_date, update_by, update_date)
+VALUES ('cz060_icon_112', '涂胶', '112', 'CZ060-OP230(PDA过站)', '0', @pda_auth, 'system', NOW(), 'system', NOW());
+INSERT INTO mes_icons (id, title, mode, remark, status, auth, create_by, create_date, update_by, update_date)
+VALUES ('cz060_icon_113', '全检', '113', 'CZ060-OP235(PDA过站)', '0', @pda_auth, 'system', NOW(), 'system', NOW());
+INSERT INTO mes_icons (id, title, mode, remark, status, auth, create_by, create_date, update_by, update_date)
+VALUES ('cz060_icon_114', 'GP12成品检验', '114', 'CZ060-OP240(PDA过站)', '0', @pda_auth, 'system', NOW(), 'system', NOW());
+INSERT INTO mes_icons (id, title, mode, remark, status, auth, create_by, create_date, update_by, update_date)
+VALUES ('cz060_icon_115', '成品打包', '115', 'CZ060-OP255(PDA过站)', '0', @pda_auth, 'system', NOW(), 'system', NOW());
+INSERT INTO mes_icons (id, title, mode, remark, status, auth, create_by, create_date, update_by, update_date)
+VALUES ('cz060_icon_116', '入库', '116', 'CZ060-OP260(PDA过站)', '0', @pda_auth, 'system', NOW(), 'system', NOW());
+INSERT INTO mes_icons (id, title, mode, remark, status, auth, create_by, create_date, update_by, update_date)
+VALUES ('cz060_icon_117', '出货', '117', 'CZ060-OP265(PDA过站)', '0', @pda_auth, 'system', NOW(), 'system', NOW());
+
+-- ============================================================
+-- 权限分配:auth 串 mes:pda:cz060 授权给 system 账号
+-- 参照现有先例(OP80打磨按钮菜单 + damo 角色),按 JeeSite 权限链:
+--   js_sys_menu(permission) -> js_sys_role_menu -> js_sys_role -> js_sys_user_role -> 用户
+-- 注:system 为超级管理员,本身绕过权限校验即可看到图标;
+--     此处按规范落库,后续给其它 PDA 工位账号授权时,只需把角色 cz060 分配给对应账号即可。
+-- ============================================================
+
+-- 1. 按钮权限菜单(挂在「APP模块权限」目录 1689510779897856000 下)
+INSERT INTO js_sys_menu (menu_code, parent_code, parent_codes, tree_sort, tree_sorts, tree_leaf, tree_level, tree_names,
+  menu_name, menu_type, menu_href, menu_target, menu_icon, menu_color, menu_title, permission, weight, is_show,
+  sys_code, module_codes, status, create_by, create_date, update_by, update_date)
+VALUES ('2040000000000000001', '1689510779897856000', '0,1689510779897856000,', 2200, '0000009590,0000002200,', 1, 1,
+  'APP模块权限/CZ060工位过站', 'CZ060工位过站', '2', '', '', '', '', '', 'mes:pda:cz060', 40, '1',
+  'default', 'app', '0', 'system', NOW(), 'system', NOW());
+
+-- 2. 角色:CZ060新线过站
+INSERT INTO js_sys_role (role_code, role_name, view_code, role_type, role_sort, is_sys, user_type, data_scope, biz_scope,
+  status, create_by, create_date, update_by, update_date, corp_code, corp_name)
+VALUES ('cz060', 'CZ060新线过站', 'cz060', '', 300, '0', 'employee', NULL, NULL,
+  '0', 'system', NOW(), 'system', NOW(), '0', 'JeeSite');
+
+-- 3. 角色 -> 按钮权限菜单
+INSERT INTO js_sys_role_menu (role_code, menu_code) VALUES ('cz060', '2040000000000000001');
+
+-- 4. system 账号 -> 角色
+INSERT INTO js_sys_user_role (user_code, role_code) VALUES ('system', 'cz060');