Commit Graph

274 Commits

Author SHA1 Message Date
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 a8160867ae feat: 返回数据自动约成2位小数 2023-08-21 14:08:47 +08:00
caoqianming b31d3937f8 feat: enstat2 增加水耗和压缩空气统计 2023-08-21 09:18:58 +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 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 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 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 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 67d04a9a41 feat: 可以不用间隔运行get_total_hour_now 2023-08-02 17:25:07 +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 5402f2181c feat: 增加enstat 统计数据,优化task执行 2023-08-02 10:22:29 +08:00
caoqianming 8e3802966e feat: enstat参数计算并新建enstat2表 2023-07-28 17:36:44 +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 b634bac616 feat: sflog获取年月日优化 2023-07-25 11:23:36 +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 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 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 9498e5eb22 feat: 测点统计记录支持手动创建 2023-07-06 17:03:28 +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 3b427cce59 feat: 测点统计表及相关逻辑cal_val修改 2023-06-30 10:21:34 +08:00
caoqianming 783869638f fix: mpoint添加时mgroup必填 2023-06-27 16:08:45 +08:00
caoqianming 06c896c97f fix: perms_map 修改 2023-06-26 17:17:37 +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 1d16949d8a feat: 增加wpm,qm,mtm三个app 2023-06-20 17:05:50 +08:00
caoqianming d2392a3c74 feat: 完善enm task相关功能 2023-06-15 16:57:29 +08:00
caoqianming 21a1cc4e63 fix: 修改enm swagger read_only的展示 2023-06-15 08:37:14 +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 cf4654a532 feat: 添加enm相关内容 2023-06-09 09:42:46 +08:00
caoqianming 9d9e670240 feat: enm models初步设计 2023-06-07 13:48:00 +08:00
caoqianming 46b0638bfb feat: 添加enm app 2023-06-02 17:50:41 +08:00