Commit Graph

1155 Commits

Author SHA1 Message Date
caoqianming 909499fc44 feat: 默认密码设置复杂 2023-08-24 10:11:11 +08:00
caoqianming 4f6838423b feat: 密码登录复杂度校验可选择 2023-08-24 09:14:39 +08:00
caoqianming c424254670 feat: 增加get_day_s方法 2023-08-23 13:50:43 +08:00
caoqianming e907b152f3 feat: enstat2增加筛选条件 2023-08-23 12:58:26 +08:00
caoqianming beb9624548 feat: price change 时计算加锁 2023-08-23 12:45:14 +08:00
caoqianming 4fdddec6d6 fix: 先去除加锁功能 2023-08-23 08:52:55 +08:00
caoqianming 18942d57c9 fix: cal_enstat2 bug 2023-08-23 08:48:37 +08:00
caoqianming 50714225e5 fix: cal_enstat2 bug 2023-08-23 08:45:09 +08:00
caoqianming cd5cf00fad fix: cal_enstat bug 2023-08-23 08:39:49 +08:00
caoqianming 4cd2c0f85b feat: enstat2增加day_s统计及相应的tasks改动 2023-08-23 08:33:45 +08:00
caoqianming 11ced96400 feat: ecm filter 查询 2023-08-22 14:28:00 +08:00
caoqianming 315f832ff2 fix: 先调整回来再处理 2023-08-22 14:10:00 +08:00
caoqianming 74e81e1a7c feat: ecm filter 查询 2023-08-22 14:06:31 +08:00
caoqianming a0135ec965 feat: compress img 默认40kb 2023-08-22 13:58:59 +08:00
caoqianming 31b0f33751 feat: 提高导出限制 2023-08-22 13:56:17 +08:00
caoqianming c615d20a5c feat: 提高导出限制 2023-08-22 13:55:19 +08:00
caoqianming ab9b9d9804 fix: event 导出bug 2023-08-22 11:25:21 +08:00
caoqianming 563893efac feat: event增加压缩图片字段 2023-08-22 11:13:09 +08:00
caoqianming 39a3001211 fix: 导出时用压缩图 2023-08-22 10:42:01 +08:00
caoqianming 9ba12d06da feat: global img 压缩 2023-08-22 10:33:19 +08:00
caoqianming 0772be47de fix: 导出时的bug 2023-08-22 09:20:29 +08:00
caoqianming 6f7a732618 feat: ecm 提高导出数据限制 2023-08-22 09:12:58 +08:00
caoqianming a8160867ae feat: 返回数据自动约成2位小数 2023-08-21 14:08:47 +08:00
caoqianming b31d3937f8 feat: enstat2 增加水耗和压缩空气统计 2023-08-21 09:18:58 +08:00
caoqianming ad9027d888 fix: 煤粉热值取白班值 2023-08-17 15:05:40 +08:00
caoqianming fdf67b5dc5 fix: mpointstat增加查询条件 2023-08-15 16:00:23 +08:00
caoqianming dbe1635788 feat: mpointstat增加查询条件 2023-08-15 15:56:56 +08:00
caoqianming 2c8a86d6f5 fix: if hour改为if hour is not None 2023-08-15 15:49:35 +08:00
caoqianming fba349191c feat: 作业未选证书时默认选择全部该成员全部证书 2023-08-10 17:12:42 +08:00
caoqianming cdc53fd14f fix: month_st计算bug 2023-08-09 15:07:25 +08:00
caoqianming fef37ebcd7 feat: enstat list返回数据打平2 2023-08-09 14:20:00 +08:00
caoqianming 1ee3eb4db3 feat: mpintstat增加mgroup name查询条件 2023-08-09 13:27:59 +08:00
caoqianming 584e5dc5c3 feat: enstat list返回数据打平 2023-08-09 13:17:13 +08:00
caoqianming ccfeb9d901 feat: sflogexp合并stlog 2023-08-08 14:41:50 +08:00
caoqianming f4e3d43034 fix: 增加查询条件 2023-08-08 11:01:33 +08:00
caoqianming 959e3e3d8d feat: enstat增加start_time和end_time的查询条件 2023-08-07 16:00:10 +08:00
caoqianming 2f42d8386e feat: eval_formula测试通过 2023-08-04 16:57:12 +08:00
caoqianming 5cfb12113e fix: mpointserializer validate 时不做mgroup绑定allocate处理2 2023-08-04 16:14:57 +08:00
caoqianming 4157fd95a8 fix: mpointserializer validate 时不做mgroup绑定allocate处理 2023-08-04 16:00:32 +08:00
caoqianming 039876349e fix: mpointserializer validate 错误 2023-08-04 15:34:01 +08:00
caoqianming 866ad4d15d feat: mpoint创建时校验问题 2023-08-04 15:17:51 +08:00
caoqianming dcd338e5fa feat: mpointstat增加返回内容 2023-08-04 14:53:51 +08:00
caoqianming 448285e3a1 feat: 增加enstat筛选条件 2023-08-04 14:35:00 +08:00
caoqianming 8808a14ef2 fix: translate_eval_formula bug 2023-08-04 14:34:39 +08:00
caoqianming 50a34a44bb feat: 只更新必要的字段 2023-08-04 14:29:23 +08:00
caoqianming ebe6ab9f3b feat: 增加生产异常动态记录表 2023-08-04 14:26:53 +08:00
caoqianming 4e5adc6dc3 feat: 获取工段全年目标 2023-08-04 14:26:00 +08:00
caoqianming 2be3c43bef feat: 添加enstat2路由 2023-08-04 14:25:10 +08:00
caoqianming 16971d9742 feat: 返回时携带ep_monitored_name 2023-08-04 09:55:26 +08:00
caoqianming 959fc60e24 feat: 获取工段全年目标值 2023-08-04 09:24:00 +08:00
caoqianming c7b7d9cec4 fix: cal_enstat_when_pcoal_heat_change的qs获取bug 2023-08-03 14:09:47 +08:00
caoqianming 7fd10f3e51 fix: pcoal_coal_consume可能为None 2023-08-03 13:58:15 +08:00
caoqianming cb60fe2728 feat: 其他成本数据忘记保存 2023-08-03 13:33:27 +08:00
caoqianming ac0908dc11 fix: month_st时equip_data计算失误 2023-08-03 11:16:04 +08:00
caoqianming 60ac9e6ac2 fix: except ZeroDivisionError 2023-08-03 10:37:03 +08:00
caoqianming a609b1db94 feat: cal_enstat_when_team_change 2023-08-03 10:31:38 +08:00
caoqianming 8ab973749d feat: goal增加查询条件 2023-08-02 17:42:19 +08:00
caoqianming 67d04a9a41 feat: 可以不用间隔运行get_total_hour_now 2023-08-02 17:25:07 +08:00
caoqianming 40ecd52fee feat: 可根据时间段生成排版记录 2023-08-02 15:54:09 +08:00
caoqianming e1e8d76ecf fix: formula 允许为空 2023-08-02 15:20:06 +08:00
caoqianming d1d427927e feat: 暂时先同步执行,后面再优化 2023-08-02 15:09:56 +08:00
caoqianming 25e49601a5 fix: task_chain group 2023-08-02 14:38:22 +08:00
caoqianming 5c3af36441 fix: 未注册为task 2023-08-02 14:28:13 +08:00
caoqianming 7619e5156c feat: cal_mpointstats分组执行 2023-08-02 14:12:46 +08:00
caoqianming ad2f903c89 fix: init_test bug 2023-08-02 10:51:48 +08:00
caoqianming 6fa1d379d3 feat: priceset feeset change触发enstat重新计算 2023-08-02 10:23:42 +08:00
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