Commit Graph

1089 Commits

Author SHA1 Message Date
caoqianming 377817f04c feat: sflog增加查询参数已获取当前值班记录 2023-07-07 15:36:49 +08:00
caoqianming 9d26946195 feat: bi exec查询参数校验 2023-07-07 15:36:06 +08:00
caoqianming 31ec00ba55 fix: 提前离厂只检查最近日志 2023-07-07 12:59:37 +08:00
caoqianming 9498e5eb22 feat: 测点统计记录支持手动创建 2023-07-06 17:03:28 +08:00
caoqianming ad0c3cdd7c fix: dataset validate默认sql_query为空/缺少查询参数提示 2023-07-06 16:58:04 +08:00
caoqianming e51d19fac0 fix: 初始化检测录入排序及取消质检任务执行 2023-07-06 14:48:33 +08:00
caoqianming e399e8fa4b fix: qm task 计算bug 2023-07-06 12:13:12 +08:00
caoqianming b672581c11 feat: 增加部分排序功能 2023-07-06 10:32:51 +08:00
caoqianming 9c83e9719e fix: qm task 计算时rate_pass 单独处理 2023-07-06 09:48:41 +08:00
caoqianming 79de49ed23 feat: 重新入厂的bug2 2023-07-06 09:10:45 +08:00
caoqianming 270b17e104 feat: 重新入厂的bug 2023-07-06 09:07:56 +08:00
caoqianming 1de238ca07 feat: 相关方人员重新入厂 2023-07-06 08:49:18 +08:00
caoqianming dab2d164b1 feat: 值班记录增加最后质检时间 2023-07-06 08:39:57 +08:00
caoqianming 46a5aa7cc7 fix: quastat task 计算优化3 2023-07-05 17:16:47 +08:00
caoqianming 4ae0ce1d9e fix: quastat task 计算优化2 2023-07-05 17:07:20 +08:00
caoqianming e0fcb2e22b fix: 初始化检测bug 2023-07-05 16:39:01 +08:00
caoqianming 07f517de58 fix: quastat task 计算优化 2023-07-05 16:32:08 +08:00
caoqianming a063db0c9b fix: quastat task 计算有误 2023-07-05 16:21:33 +08:00
caoqianming edd2dc5600 fix: 初始化检测录入rate_pass, create_by, belong_dept需要有 2023-07-05 16:17:10 +08:00
caoqianming eef4beebb4 fix: 修复quastat task 2023-07-05 16:02:28 +08:00
caoqianming 965e3169ba feat: 初始化检测录入bug 2023-07-05 14:35:21 +08:00
caoqianming a5272c6c6f fix: BulkCreateModelMixin bug 2023-07-05 14:23:23 +08:00
caoqianming 9d2108ce47 fix: quastat rate_pass字段可为空 2023-07-05 14:12:03 +08:00
caoqianming 066217d6c1 fix: 初始化检测录入bug 2023-07-05 14:06:44 +08:00
caoqianming ae84f6b6c9 feat: quastat 加入批量接口 2023-07-05 13:45:03 +08:00
caoqianming 235d17f193 feat: 设备增加power_kw查询 2023-07-05 13:44:41 +08:00
caoqianming 93881852d0 feat: sflog init_test接口 2023-07-05 13:44:07 +08:00
caoqianming 0f1bb7fd72 feat: utils增加批量接口mixin 2023-07-05 13:43:30 +08:00
caoqianming 388d9213fd feat: 增加了test_material字段 2023-07-04 13:30:19 +08:00
caoqianming 46b179b6ff doc: 补充注释 2023-07-04 10:11:16 +08:00
caoqianming fe117d05be feat: 增加input_materials 字段 2023-07-04 10:07:55 +08:00
caoqianming 1537da6bda feat: 增加fim app; 费用及成本配置 2023-07-04 10:07:15 +08:00
caoqianming 673fd0501c feat: equipment增加power_kw字段 2023-06-30 17:14:18 +08:00
caoqianming f62344509f feat: bi exec 支持code执行 2023-06-30 16:15:04 +08:00
caoqianming 73ade42f8d feat: visit增加来访事由 2023-06-30 15:12:39 +08:00
caoqianming 6b0e0fae3b feat: mpoint serializer增加material_name 2023-06-30 14:15:59 +08:00
caoqianming f6a15be31d feat: mpoint增加material字段 2023-06-30 12:09:57 +08:00
caoqianming f620dc0bcb refector: 生成排班记录 2023-06-30 10:24:15 +08:00
caoqianming a6167294f7 feat: sflog filter 2023-06-30 10:22:46 +08:00
caoqianming d285e09c5c fix: quastat create时年月日bug 2023-06-30 10:22:13 +08:00
caoqianming 3b427cce59 feat: 测点统计表及相关逻辑cal_val修改 2023-06-30 10:21:34 +08:00
caoqianming 72782163ab feat: admin增加mgroup 2023-06-30 10:19:10 +08:00
caoqianming d105218d9b fix: 删除布设时把监控该算法线程停止 2023-06-29 11:25:38 +08:00
caoqianming ef1ea0e784 fix: 通知提醒出错 2023-06-29 11:14:50 +08:00
caoqianming 6bbbf16049 feat: 值班记录排序 2023-06-28 09:13:14 +08:00
caoqianming 49fa109233 feat: 自动创建值班记录 2023-06-28 09:00:43 +08:00
caoqianming 783869638f fix: mpoint添加时mgroup必填 2023-06-27 16:08:45 +08:00
caoqianming e709b28d25 feat: mtm goal 接口 2023-06-27 14:17:25 +08:00
caoqianming 14539b89ba feat: 质量数据班日,班月,班年录入与处理 2023-06-27 13:49:03 +08:00
caoqianming 06c896c97f fix: perms_map 修改 2023-06-26 17:17:37 +08:00
caoqianming 13b0204c6b feat: quastat sflog create 不需要 belong_dept 2023-06-26 16:49:16 +08:00
caoqianming 51737bcdd8 fix: 权限代号调整 2023-06-26 16:45:52 +08:00
caoqianming 0e38b36ef5 feat: mtm相关表加入django后台 2023-06-26 16:33:06 +08:00
caoqianming 24fa17ddb5 fix: 修改字段后的bug 2023-06-26 16:29:51 +08:00
caoqianming 0145beb63f feat: 值班记录质量分析数据录入 2023-06-26 16:00:23 +08:00
caoqianming 07a8e5977f feat: 值班记录增加电耗统计 2023-06-25 17:10:39 +08:00
caoqianming ddd3f6a5f0 feat: 测点统计表接口 2023-06-25 17:09:19 +08:00
caoqianming c2ad28ae4b fix: 同步大华部门信息需要dahua_enabled 2023-06-25 16:50:54 +08:00
caoqianming a2b2cbe153 refector: 不需要打算法图片日志 2023-06-25 15:07:27 +08:00
caoqianming 24ce6836b3 fix: wf触发执行校验bug 2023-06-22 08:01:25 +08:00
caoqianming 730942598c fix: wf触发执行校验bug 2023-06-22 07:44:52 +08:00
caoqianming db1dddd70d fix: wf触发执行校验bug 2023-06-22 07:42:43 +08:00
caoqianming c99ab40d84 fix: wf触发执行校验bug 2023-06-22 07:40:26 +08:00
caoqianming a9825f5ad4 fix: rpj visit 在工单初始状态时可以编辑 2023-06-22 01:07:24 +08:00
caoqianming b2cfdf9995 fix: ticket_handle_permission_check 重新梳理 2023-06-22 00:14:17 +08:00
caoqianming d44f9751bb fix: 重复创建工单之隐藏bug 2023-06-21 22:50:05 +08:00
caoqianming df1b0c6b20 fix: 工单回到创建中的相应操作 2023-06-21 22:16:23 +08:00
caoqianming 50749cd10d fix: oplworker在工单开始状态可以新增 2023-06-21 17:14:35 +08:00
caoqianming 0787a9a70f fix: oplworker在工单初始状态下可删除 2023-06-21 17:10:18 +08:00
caoqianming e372015e7d fix: 校验重复创建工单 2023-06-21 16:50:03 +08:00
caoqianming 7ab3535c83 feat: task_ticket 默认发送通知 2023-06-21 15:31:36 +08:00
caoqianming 07822f093d feat: 工单回到创建中时更改作业状态 2023-06-21 15:14:06 +08:00
caoqianming 8a7ae2994e feat: 算法打印图片日志 2023-06-21 11:32:32 +08:00
caoqianming 1d16949d8a feat: 增加wpm,qm,mtm三个app 2023-06-20 17:05:50 +08:00
caoqianming 0312de5cf5 feat: opm operation 增加查询条件 2023-06-20 11:13:29 +08:00
caoqianming d2392a3c74 feat: 完善enm task相关功能 2023-06-15 16:57:29 +08:00
caoqianming 4f37b4c023 feat: 如果echart_options时以function开头就不处理了 2023-06-15 16:19:35 +08:00
caoqianming 21a1cc4e63 fix: 修改enm swagger read_only的展示 2023-06-15 08:37:14 +08:00
caoqianming 6b77346574 feat: 调整ai以适应算法部署到本地 2023-06-15 08:24:41 +08:00
caoqianming afa6cec3a0 fix: enm tasks bug 2023-06-14 16:50:11 +08:00
caoqianming 5f9ef83c6e feat: 完善enm表 2023-06-14 15:30:51 +08:00
caoqianming 2db95349b2 feat: 关闭工单时需要执行提交时调用方法 2023-06-13 09:29:51 +08:00
caoqianming cf4654a532 feat: 添加enm相关内容 2023-06-09 09:42:46 +08:00
caoqianming 52bb1ca367 feat: 修改系统自定义配置文件 2023-06-09 09:41:18 +08:00
caoqianming f452b43016 fix: 生成工单流水号 ok 2023-06-09 09:30:34 +08:00
caoqianming 91b2ac3755 Revert "fix: 工单流水号+1"
This reverts commit e8886902f2.
2023-06-09 09:11:16 +08:00
caoqianming 94ac4ddbe9 Revert "fix: 工单流水号不用加1"
This reverts commit 265d89c6f8.
2023-06-09 09:08:44 +08:00
caoqianming 059b044478 feat: 高处和动火校验证书是否上传 2023-06-08 10:35:39 +08:00
caoqianming 265d89c6f8 fix: 工单流水号不用加1 2023-06-08 10:26:46 +08:00
caoqianming ca485d9c78 fix: 矫正工单流水号bug 2023-06-08 10:15:49 +08:00
caoqianming d6198889f4 fix: 矫正工单流水号 2023-06-08 10:11:33 +08:00
caoqianming e8886902f2 fix: 工单流水号+1 2023-06-08 10:05:42 +08:00
caoqianming a7df6d339c fix: 作业删除时 删除可能的工单出现的bug 2023-06-08 09:21:53 +08:00
caoqianming 5c94f144bd fix: apk upload 修改sysconf 2023-06-08 09:14:56 +08:00
caoqianming c4e44cda26 feat: 算法处理失败时邮件通知 2023-06-07 14:51:37 +08:00
caoqianming 9d9e670240 feat: enm models初步设计 2023-06-07 13:48:00 +08:00
caoqianming d10b68c2b2 feat: 暂时不检查作业人员就位事件 2023-06-07 09:51:44 +08:00
caoqianming 8d08e2dde1 fix: operation 支持直接删除管理员操作 2023-06-07 09:42:21 +08:00
caoqianming 364abe1a3b feat: operation 支持直接删除管理员操作 2023-06-07 09:16:17 +08:00
caoqianming 31f5a402c0 feat: 有限空间气体检测记录必填 2023-06-05 14:30:13 +08:00
caoqianming 50fe411b71 feat: operation 增加筛选条件 2023-06-05 12:50:33 +08:00
caoqianming 15db992dff refetor: 修改get_ticket_sn 参数type 2023-06-03 16:56:02 +08:00
caoqianming 5d7880ca64 fix: opl ticket 撤回时支持修改oplworker gascheck 2023-06-03 16:33:25 +08:00
caoqianming 46b0638bfb feat: 添加enm app 2023-06-02 17:50:41 +08:00
caoqianming 5ded2347b7 feat: 更改部分系统配置为json自定义 2023-06-01 17:12:07 +08:00
caoqianming 313005eb5c refector: tlog查看权限放开 2023-05-31 16:49:46 +08:00
caoqianming ae071d1d9c perf: dataset exec 缓存优化 2023-05-31 09:19:32 +08:00
caoqianming 8a1d43b7b8 refector: 删除相关方时将该部门的账户禁用 2023-05-29 09:06:09 +08:00
caoqianming a3d9fe4606 feat: 报表模块基础开发 2023-05-26 13:02:43 +08:00
caoqianming a1efcb46da fix: 事件删除权限 2023-05-25 17:12:22 +08:00
caoqianming 515952ef8d fix: 管理员返回所有权限代号 2023-05-25 11:19:23 +08:00
caoqianming 2d2edc1ab3 fix: 管理员返回所有权限代号 2023-05-25 10:51:39 +08:00
caoqianming b338cbc34c refector: 如果超出时间不检查人员未就位 2023-05-25 10:46:31 +08:00
caoqianming 5131daa5cd feat: 接口增加默认缓存时间 2023-05-25 10:45:41 +08:00
caoqianming 3d9f04a443 refector: 管理员返回所有权限代号 2023-05-25 10:44:05 +08:00
caoqianming 863a301cb8 refector: visit audit end 修改司机入厂逻辑 2023-05-24 17:35:51 +08:00
caoqianming 9dff134329 fix: algo channel 添加bug 2023-05-24 17:19:32 +08:00
caoqianming 936af7c4fe feat: 开始添加设备管理模块 2023-05-22 15:55:32 +08:00
caoqianming b1ded623fa feat: 增加报表模块 2023-05-11 16:20:36 +08:00
caoqianming 4e6f4b249b fix: while 循环做card_door_authority的提高补偿机制次数 2023-05-09 17:02:41 +08:00
caoqianming eeca896a78 fix: 紧急bug 2023-05-09 09:52:54 +08:00
caoqianming 25e56b4bd0 feat: 查询用户列表可返回更详细的定位信息 2023-05-09 09:51:28 +08:00
caoqianming ef95b3c51f feat: 查询用户列表可返回更详细的定位信息 2023-05-09 09:46:44 +08:00
caoqianming b38e4860ac refector: 缓存区域信息带名字 2023-05-09 09:42:02 +08:00
caoqianming 702ef7641c fix: while 循环做card_door_authority的补偿机制4 2023-05-09 08:46:02 +08:00
caoqianming ca1a426182 fix: while 循环做card_door_authority的补偿机制3 2023-05-09 08:34:45 +08:00
caoqianming a395817028 fix: while 循环做card_door_authority的补偿机制2 2023-05-08 18:14:57 +08:00
caoqianming 8d3d1934b7 fix: while 循环做card_door_authority的补偿机制 2023-05-08 15:51:05 +08:00
caoqianming f59426b426 fix: 后入厂时的reason pop出 2023-05-06 13:20:07 +08:00
caoqianming 33cc805172 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2023-05-05 09:40:24 +08:00
caoqianming b1ec172829 refector: 尝试访问卡片以确保卡片生成 2023-05-05 09:40:20 +08:00
caoqianming 923e812890 fix: ep update 不放在事务中 2023-04-27 14:43:01 +08:00
caoqianming c2c05a5075 fix: opl level可为空 2023-04-27 14:42:33 +08:00
caoqianming e6933f9fc4 fix: rpjmember update rpj获取错误 2023-04-27 11:31:01 +08:00
caoqianming 7128e67e92 fix: 人员导出excel信息bug 2023-04-19 19:29:18 +08:00
caoqianming bc6aa5cacc fix: 人员导出excel信息bug 2023-04-19 19:25:39 +08:00
caoqianming 9192d9ffda fix: 人员导出excel信息bug 2023-04-19 19:20:52 +08:00
caoqianming aefd513987 fix: swipe_next exception_type 保存bug 2023-04-19 18:43:49 +08:00
caoqianming 6a0929dc10 fix: swipe_next还是通过save,这样可见update_time 变动 2023-04-19 17:36:10 +08:00
caoqianming aa84d50957 feat: employee导出并增加是否有定位卡的筛选 2023-04-18 19:34:03 +08:00
caoqianming 3410f5d968 feat: MySchedule创建时自动获取汉语描述 2023-04-18 18:10:50 +08:00
caoqianming 0303184ceb feat: 阿里云短信加入auto_log装饰器 2023-04-17 08:21:07 +08:00
caoqianming 1c661631ea fix: 加签和加签完成接口需要校验 2023-04-17 00:05:32 +08:00
caoqianming a757321f5c fix: 解决cache_areas_info重复执行的问题 2023-04-15 21:10:16 +08:00
caoqianming c4805c8d8e fix: 相关方中途入厂时因事务引发的bug 2023-04-15 21:02:33 +08:00
caoqianming 3af691844b fix: rpj_member_leave 中更新当前入厂项目bug 2023-04-15 18:25:19 +08:00
caoqianming 59e89c19ba fix: 解决cache_areas_info重复执行的问题 2023-04-15 17:54:18 +08:00
caoqianming 64bdd72146 fix: snap_and_analyse时更新缓存 2023-04-15 17:32:58 +08:00
caoqianming 284a36e24c fix: snap_and_analyse时更新缓存 2023-04-15 17:32:44 +08:00
caoqianming 0b1323b41d feat: 支持开启服务侧算力监控 2023-04-14 17:20:32 +08:00
caoqianming ba937ce751 refector: 一点优化 2023-04-14 16:54:10 +08:00
caoqianming 65ff80db75 refector: 工作流脚本每次失败都记录日志 2023-04-14 16:53:35 +08:00
caoqianming 2d2f171c32 feat: tdevice 视频通道查询带third_info 2023-04-14 16:26:21 +08:00
caoqianming 03ac2a5b1b refector: 命名修改 2023-04-14 16:24:56 +08:00
caoqianming d9c318de8e refector: 证书检索条件 2023-04-13 17:16:46 +08:00
caoqianming c097b44e0c fix: 文件上传不做幂等操作 2023-04-13 09:45:13 +08:00
caoqianming 50553bd0c0 fix: swip_next bug 2023-04-13 08:01:11 +08:00
caoqianming 005919af19 fix: 直接请求user列表不应该返回删除的用户 2023-04-12 18:03:24 +08:00
caoqianming 68c54a73e3 refector: swipe_next 优化2 2023-04-12 17:10:38 +08:00
caoqianming f4aacc2129 refector: swipe_next 优化 2023-04-12 17:06:38 +08:00
caoqianming 8f2bea554f feat: 摄像头支持随时开启算法监控(每10s拍照) 2023-04-12 15:56:50 +08:00
caoqianming eea05cf6f3 refector: 事件处理取消一些限制 2023-04-12 15:50:58 +08:00
caoqianming 2b054107c0 fix: 非工单节点下的流转不继续 2023-04-12 14:20:48 +08:00
caoqianming 14dc063f59 refector: post请求进行幂等操作 2023-04-12 14:19:18 +08:00
caoqianming 0bb351fb99 fix: 修改opl level字段默认为空字符 2023-04-12 14:18:23 +08:00
caoqianming 9d68a7006e refector: 修改dpm字段 2023-04-12 14:17:45 +08:00
caoqianming 557f95e4cf fix: 权限cache维持300s 2023-04-10 14:57:41 +08:00
caoqianming 731c93ce71 fix: get_user_perms_map 中 data_range取最小值 2023-04-10 14:56:41 +08:00
caoqianming 1a61e5ab27 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2023-04-07 15:06:30 +08:00
caoqianming 121d6ec15c feat: 增加相关方黑名单 2023-04-07 15:06:26 +08:00
caoqianming a6f5137dff fix: close_visit_by_leave_time 待入厂也应正常关闭 2023-04-05 10:15:05 +08:00
caoqianming 8df57ed99a refector: 开启关闭监控加入日志记录 2023-04-05 10:04:35 +08:00
caoqianming 96c12108e0 fix: 工单流水号bug 2023-04-03 14:53:40 +08:00
caoqianming 4c4e637cc3 fix: rparty delete同步dept 2023-04-03 14:01:38 +08:00
caoqianming 7cbd581701 fix: rparty create时dept字段冲突2 2023-04-03 13:35:54 +08:00
caoqianming cd3a0393ad fix: 生成工单流水号bug 2023-04-03 13:19:06 +08:00
caoqianming 3baa41b504 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2023-04-03 12:44:17 +08:00
caoqianming ec6c1c3d84 fix: rparty create时dept字段冲突 2023-04-03 12:44:13 +08:00
caoqianming be530ca9b9 fix: am config修改 2023-04-02 10:18:24 +08:00
caoqianming e32f82ace7 refector: send_mail_task优化 2023-03-31 23:16:40 +08:00
caoqianming f2c02a76d4 refector: send_mail_task优化 2023-03-31 10:14:01 +08:00
caoqianming 876c7734f1 refector: 工单 bind_x 优化 2023-03-30 12:22:13 +08:00
caoqianming a415859a26 fix: 许可证在工单撤回状态下可以编辑 2023-03-30 11:13:35 +08:00
caoqianming 201eabf33e fix: filter_dept字段长度修改 2023-03-30 10:08:49 +08:00
caoqianming ebcef8721f fix: clock record view加入权限控制 2023-03-29 16:53:03 +08:00
caoqianming 0766cba363 Merge branch 'v2' 2023-03-29 16:36:03 +08:00
caoqianming 7908b06cd1 fix: opl monitor不用celery 2023-03-29 10:22:41 +08:00
caoqianming 9b0de2e011 refector: user is_active用is_deleted统一处理 2023-03-28 10:46:34 +08:00
caoqianming 6d1c9e03c9 refector: 短信发送备用渠道,未写 2023-03-28 09:51:30 +08:00
caoqianming 76ce412741 fix: close_rpj_by_leave_time 执行 rpj_m_leave 2023-03-27 13:03:50 +08:00
caoqianming a046fa46f0 fix: 打卡记录导出bug2 2023-03-24 17:52:37 +08:00
caoqianming e0210c4bef fix: 打卡记录导出bug 2023-03-24 17:49:33 +08:00
caoqianming 1ed0a2542e fix: 入厂后账户启用 2023-03-24 17:34:42 +08:00
caoqianming 49abd43cf3 fix: 该项目成员已做离厂操作 2023-03-24 16:39:21 +08:00
caoqianming ce90e11c36 fix: idempotent 加入request_path 2023-03-24 16:38:51 +08:00
caoqianming 503953bb11 fix: 成员离厂有限制2 2023-03-24 16:23:56 +08:00
caoqianming 1966dde2c0 fix: 成员离厂有限制2 2023-03-24 16:20:50 +08:00
caoqianming 9d7739ae59 fix: 成员离厂有限制/大华启用才校验图片接口 2023-03-24 15:31:20 +08:00
caoqianming 068474f4e6 refector: rpjmember destory改回 2023-03-24 14:56:43 +08:00
caoqianming e2a6b669ff refector: rpj_member_leave 当前项目回写 2023-03-24 10:06:04 +08:00