Commit Graph

1089 Commits

Author SHA1 Message Date
caoqianming 3dc647272a feat: cal_enstat_when_pcoal_val_change 未完成 2023-08-02 10:22:51 +08:00
caoqianming 5402f2181c feat: 增加enstat 统计数据,优化task执行 2023-08-02 10:22:29 +08:00
caoqianming ab581f2851 fix: after_bulk_update执行后不用return 2023-08-02 10:19:38 +08:00
caoqianming 251e373d5b feat: get_total_hour_now 修改 2023-08-01 16:41:47 +08:00
caoqianming 80b61c9f8b fix: get_total_hour_now bug 2023-08-01 08:54:01 +08:00
caoqianming d2e4439b73 fix: get_total_hour_now bug 2023-08-01 08:50:06 +08:00
caoqianming a29ed1edc8 fix: get_total_hour_now sql查询bug 2023-07-31 17:46:56 +08:00
caoqianming 8e3802966e feat: enstat参数计算并新建enstat2表 2023-07-28 17:36:44 +08:00
caoqianming 6d5d2f84d4 feat: 停机记录分配到每一个班 2023-07-28 17:36:09 +08:00
caoqianming d487f0889f feat: 获取煤粉热值 2023-07-28 17:20:54 +08:00
caoqianming 56bc87c913 feat: 启动时重新加载系统配置json 2023-07-28 17:19:36 +08:00
caoqianming 1d0b43d75f feat: sflog增加total_hour_now以及pcoal_val 2023-07-28 17:18:59 +08:00
caoqianming a668ca0b2f feat: 返回数据增加belong_dept_name等 2023-07-25 14:24:21 +08:00
caoqianming 841815bbb6 fix: 班月质检数据统计错误 2023-07-25 13:58:31 +08:00
caoqianming e64ae3aebe feat: goal返回goal_cata_name和mgroup_name 2023-07-25 13:58:11 +08:00
caoqianming 437d4c923e fix: init_test 报错 2023-07-25 13:25:05 +08:00
caoqianming 887976363b fix: quastat update serializer 2023-07-25 13:21:02 +08:00
caoqianming 00677d100b feat: swagger显示问题 2023-07-25 11:33:33 +08:00
caoqianming b634bac616 feat: sflog获取年月日优化 2023-07-25 11:23:36 +08:00
caoqianming 13382171de refector: 初始化检测录入优化 2023-07-25 11:20:27 +08:00
caoqianming be9011f8f5 feat: sflog增加property以获取年月日 2023-07-25 11:19:51 +08:00
caoqianming 9f8cf21bf1 feat: 批量更新时after_bulk_update放在事务中处理 2023-07-25 11:17:34 +08:00
caoqianming 7fde7148bf feat: 质检数据重新统计并放入enstat表中 2023-07-25 11:16:38 +08:00
caoqianming 6c3cbf0c5e feat: 目标增加code查询条件 2023-07-25 11:14:32 +08:00
caoqianming e15cc2f9ce fix: enm以team做统计不是shift 2023-07-25 11:13:54 +08:00
caoqianming 6e98ec57ee feat: mpoint支持formular 2023-07-24 16:03:06 +08:00
caoqianming 27a2a20cbe feat: 值班记录增加运转时间和停机时间 2023-07-24 11:19:08 +08:00
caoqianming 0abade21b7 feat: 质检统计增加班月month_sf 2023-07-24 10:32:38 +08:00
caoqianming 6df6b75499 feat: 同步质检表 2023-07-24 10:22:41 +08:00
caoqianming f4f9cb0fae feat: 质检统计增加班月 2023-07-24 10:22:06 +08:00
caoqianming 2acd216d33 feat: eventcate code 不唯一 2023-07-19 17:24:45 +08:00
caoqianming 16f560adc0 feat: 大华订阅增加移动侦测 2023-07-19 15:30:44 +08:00
caoqianming 886843174d feat: tdevice 增加code查询条件 2023-07-19 10:20:07 +08:00
caoqianming 5ba9789de2 fix: 计算优化待完成 2023-07-19 09:18:03 +08:00
caoqianming a8afccdfca feat: 增加month_sf统计维度, 优化二次计算逻辑 2023-07-18 14:15:52 +08:00
caoqianming f8bc2294f0 feat: 初步统计能管相关数据产量和成本 2023-07-17 15:33:35 +08:00
caoqianming 3fbe3e7d0e fix: 保存last_tag_id以减少获取mplog 2023-07-11 14:52:39 +08:00
caoqianming c3d0fa1806 feat: mgroups_allocate保存时带mgroup_name 2023-07-11 14:29:32 +08:00
caoqianming c0e4b8a1b9 fix: 比例合计问题 2023-07-11 14:21:36 +08:00
caoqianming a30bffd244 fix: cal_mpointstat_manual 以班手动录入数据 2023-07-11 13:48:35 +08:00
caoqianming bf1ac0549e feat: mpointstat增加mgroup字段和相应逻辑 2023-07-11 13:46:37 +08:00
caoqianming c122335f8c feat: 支持测点数据反向分配给各工段 2023-07-11 10:53:28 +08:00
caoqianming f02135dc10 fix: init_test 排序错误 2023-07-10 16:26:23 +08:00
caoqianming a8576212a1 feat: 通过接口重新加载config 2023-07-10 15:12:45 +08:00
caoqianming e5fb485418 fix: RpjmemberCreateSerializer 的bug 2023-07-10 14:13:34 +08:00
caoqianming caaeb32817 feat: 增加能耗统计记录表 2023-07-10 13:45:22 +08:00
caoqianming 7af0447928 fix: cal_mpointstats 字符写错 2023-07-10 10:41:24 +08:00
caoqianming 9f46722f48 fix: cal_mpointstat_manual 标注bug 2023-07-10 10:20:24 +08:00
caoqianming 2884becf3f feat: 测点统计任务优化 2023-07-10 10:13:45 +08:00
caoqianming 56d9c50a39 fix: 非管理员不支持物理删除 2023-07-10 10:00:46 +08:00
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