Commit Graph

165 Commits

Author SHA1 Message Date
caoqianming 43509aa25a feat: mpointstat safe_get_or_create 2024-12-24 21:59:41 +08:00
caoqianming 71ab520f3e fix: enstat_cen_consume_unit change bug 2024-12-24 18:35:04 +08:00
zty 13c4fb6663 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-12-24 18:09:03 +08:00
zty bcaa69ab30 feat:task 修改 更新 bill_date 2024-12-24 18:09:01 +08:00
caoqianming 841ece1d4f feat: 工段计算公式校正 2024-12-24 17:54:46 +08:00
zty f5fd9558ba feat: 修改 task bill_date 2024-12-24 15:49:20 +08:00
zty aa3ba099be Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-12-24 09:26:59 +08:00
zty 978d8f3577 feat: 增加定时任务 每天更新bill_date(出厂水泥采集) 2024-12-24 09:26:57 +08:00
caoqianming 27e3dfa3b3 feat: db_ins_mplogx bill_date bug 2024-12-23 18:31:02 +08:00
zty 62a177b773 feat:登入 记录IP 和 增加每日的能源统计定时任务 2024-12-13 15:29:10 +08:00
zty 44af9bc494 feat : 修改排班规则 2024-12-11 12:18:09 +08:00
zty e6cad72807 feat: enm 增加氨水消耗量 2024-12-10 14:12:16 +08:00
zty c4c50670fd feat: 修改 tkx 峰谷平 2024-12-04 16:08:43 +08:00
zty 55b8564f0d feat:tkx 计量设备临期预警 2024-12-03 18:02:17 +08:00
zty a08e66a06a fix: task bug 修字段名 2024-12-02 15:36:36 +08:00
zty 2f31997b43 feat: enm/task 修改报警事件 2024-11-28 16:13:00 +08:00
zty 9db524dfdb feat: em/filter apps 修改设备字段信息 2024-11-25 18:14:12 +08:00
zty 9d5d7eceaf fix : tkx enm bug fix 2024-11-14 17:48:48 +08:00
zty 9c8e0081e2 feat: 修改 last_val - first_val 值 2024-11-07 16:50:11 +08:00
zty 8ec5f8c6dd feat: enm 回转窑综合电耗计算 2024-11-06 10:43:45 +08:00
zty 336f35ed28 feat:修改喇叭内容 2024-11-05 13:34:42 +08:00
zty e6e18c6c30 feat: enm/task nick_name 2024-10-15 09:54:24 +08:00
zty 96f4b0c445 feat: apps/enm 新增成本计算 2024-10-10 13:33:58 +08:00
zty 7aae49b378 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-09-13 13:41:29 +08:00
zty c4607e1608 fix /enm/service.py 停机时间短 无班组 加入异常原因 2024-09-13 13:40:45 +08:00
caoqianming 81a90f31cd feat: 计算测点可不指定物料2 2024-08-29 13:47:16 +08:00
caoqianming 0f0bc9bd37 feat: 计算测点可不指定物料 2024-08-29 10:28:59 +08:00
caoqianming e94996471f feat: 优化enstat2 2024-08-29 09:28:39 +08:00
caoqianming 038e7f86cd feat: xscript相关调整 2024-08-28 14:11:42 +08:00
caoqianming 4bfa8a5460 feat: insert_mplogx_from_xscript 修改 2024-08-27 18:42:18 +08:00
caoqianming 2be34d3caa feat: enm添加xscript 2024-08-27 17:28:30 +08:00
zty 28834f88cd fix : 煤磨 2024-08-23 17:20:57 +08:00
zty 4960ee7fac feat: 增加水泥包装 2024-08-21 17:55:23 +08:00
zty 5a35ea6028 feat: 增加出厂水泥 和 计算 2024-08-21 08:59:24 +08:00
zty c3b62f1831 fix: equip_elec_data 计算 2024-08-16 18:45:31 +08:00
zty 4cdc48e549 fix: equip_elec_data 计算 2024-08-16 18:44:00 +08:00
zty 169a31da5a fix : apps/em /enm 更改缓存存储 2024-08-08 14:52:36 +08:00
zty f97c99bf8a fix: cal_mpointstat_hour对于is_unit的计算错误 2024-08-06 17:52:21 +08:00
zty 91e9ac38f6 fix: db_insert_mplogx_batch bug 2024-08-06 17:22:28 +08:00
zty 679165cbd0 feat: db_insert_mplogx 添加限制参数 2024-08-06 17:12:58 +08:00
zty 4d498f99a3 fix: enm/task 水泥批号插入 2024-08-06 16:11:27 +08:00
zty 50cdbf9428 fix :enm/task 修改数据库连接 2024-08-06 10:53:01 +08:00
zty f09a8fe4cd add : db_ins_mplogx 增加测点插入数据库 2024-08-06 10:01:21 +08:00
caoqianming fa56d61ffc feat: 修改nowx使用aware 2024-08-02 16:39:07 +08:00
caoqianming dc7e6f9d03 fix: get_total_sec_now及cal_exp_duration_sec 添加now参数 2024-08-02 13:50:05 +08:00
caoqianming 893781ec7f feat: db_insert_mplogx不用thread 2024-07-30 10:01:42 +08:00
caoqianming 83ec822f9d fix: db_insert_mplogx bug 2024-07-16 15:36:40 +08:00
caoqianming d31cf4d143 feat: 从数据库转存到超表做count限制 2024-07-16 14:50:50 +08:00
caoqianming bf98ea8a48 feat: 从数据库转存到超表 2024-07-16 14:06:46 +08:00
caoqianming 499e5732aa fix: 更新所监测设备测点的total_production忽略必须指定设备 2024-06-24 10:02:54 +08:00