factory

Commit Graph

Select branches

Hide Pull Requests

base

gzerp

master

2.6.2025031919

2.6.2025033109

2.6.2025040115

2.6.2025040211

2.6.2025040316

2.6.2025040710

2.6.2025040813

2.6.2025040913

2.6.2025041113

2.6.2025041613

2.6.2025042311

2.6.2025042816

2.6.2025043014

2.6.2025050816

2.6.2025051208

2.6.2025051609

2.6.2025051913

2.6.2025052615

2.6.2025060409

2.6.2025060617

2.6.2025060913

2.6.2025061715

2.6.2025062015

2.7.2025062414

2.7.2025070310

2.7.2025071516

2.7.2025073110

2.7.2025080409

2.7.2025080716

2.7.2025081813

2.7.2025082616

2.7.2025082816

2.8.2025090815

2.8.2025091616

2.8.2025092816

2.8.2025101011

dbe1635788 feat: mpointstat增加查询条件 caoqianming 2023-08-15 15:56:56 +0800
2c8a86d6f5 fix: if hour改为if hour is not None caoqianming 2023-08-15 15:49:35 +0800
fba349191c feat: 作业未选证书时默认选择全部该成员全部证书 caoqianming 2023-08-10 17:12:42 +0800
cdc53fd14f fix: month_st计算bug caoqianming 2023-08-09 15:07:25 +0800
fef37ebcd7 feat: enstat list返回数据打平2 caoqianming 2023-08-09 14:20:00 +0800
1ee3eb4db3 feat: mpintstat增加mgroup name查询条件 caoqianming 2023-08-09 13:27:59 +0800
584e5dc5c3 feat: enstat list返回数据打平 caoqianming 2023-08-09 13:17:13 +0800
ccfeb9d901 feat: sflogexp合并stlog caoqianming 2023-08-08 14:41:50 +0800
f4e3d43034 fix: 增加查询条件 caoqianming 2023-08-08 11:01:33 +0800
c43474dace Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2023-08-07 16:00:14 +0800
959e3e3d8d feat: enstat增加start_time和end_time的查询条件 caoqianming 2023-08-07 16:00:10 +0800
d26a7d5805 fix: update_dict bug caoqianming 2023-08-04 18:24:17 +0800
2f42d8386e feat: eval_formula测试通过 caoqianming 2023-08-04 16:57:12 +0800
5cfb12113e fix: mpointserializer validate 时不做mgroup绑定allocate处理2 caoqianming 2023-08-04 16:14:57 +0800
4157fd95a8 fix: mpointserializer validate 时不做mgroup绑定allocate处理 caoqianming 2023-08-04 16:00:32 +0800
039876349e fix: mpointserializer validate 错误 caoqianming 2023-08-04 15:34:01 +0800
866ad4d15d feat: mpoint创建时校验问题 caoqianming 2023-08-04 15:17:51 +0800
dcd338e5fa feat: mpointstat增加返回内容 caoqianming 2023-08-04 14:53:51 +0800
448285e3a1 feat: 增加enstat筛选条件 caoqianming 2023-08-04 14:35:00 +0800
8808a14ef2 fix: translate_eval_formula bug caoqianming 2023-08-04 14:34:39 +0800
50a34a44bb feat: 只更新必要的字段 caoqianming 2023-08-04 14:29:23 +0800
ebe6ab9f3b feat: 增加生产异常动态记录表 caoqianming 2023-08-04 14:26:53 +0800
4e5adc6dc3 feat: 获取工段全年目标 caoqianming 2023-08-04 14:26:00 +0800
2be3c43bef feat: 添加enstat2路由 caoqianming 2023-08-04 14:25:10 +0800
16971d9742 feat: 返回时携带ep_monitored_name caoqianming 2023-08-04 09:55:26 +0800
959fc60e24 feat: 获取工段全年目标值 caoqianming 2023-08-04 09:24:00 +0800
c7b7d9cec4 fix: cal_enstat_when_pcoal_heat_change的qs获取bug caoqianming 2023-08-03 14:09:47 +0800
7fd10f3e51 fix: pcoal_coal_consume可能为None caoqianming 2023-08-03 13:58:15 +0800
cb60fe2728 feat: 其他成本数据忘记保存 caoqianming 2023-08-03 13:33:27 +0800
ac0908dc11 fix: month_st时equip_data计算失误 caoqianming 2023-08-03 11:16:04 +0800
60ac9e6ac2 fix: except ZeroDivisionError caoqianming 2023-08-03 10:37:03 +0800
a609b1db94 feat: cal_enstat_when_team_change caoqianming 2023-08-03 10:31:38 +0800
8ab973749d feat: goal增加查询条件 caoqianming 2023-08-02 17:42:19 +0800
67d04a9a41 feat: 可以不用间隔运行get_total_hour_now caoqianming 2023-08-02 17:25:07 +0800
40ecd52fee feat: 可根据时间段生成排版记录 caoqianming 2023-08-02 15:54:09 +0800
e1e8d76ecf fix: formula 允许为空 caoqianming 2023-08-02 15:20:06 +0800
d1d427927e feat: 暂时先同步执行,后面再优化 caoqianming 2023-08-02 15:09:56 +0800
25e49601a5 fix: task_chain group caoqianming 2023-08-02 14:38:22 +0800
5c3af36441 fix: 未注册为task caoqianming 2023-08-02 14:28:13 +0800
7619e5156c feat: cal_mpointstats分组执行 caoqianming 2023-08-02 14:12:46 +0800
ad2f903c89 fix: init_test bug caoqianming 2023-08-02 10:51:48 +0800
6fa1d379d3 feat: priceset feeset change触发enstat重新计算 caoqianming 2023-08-02 10:23:42 +0800
3dc647272a feat: cal_enstat_when_pcoal_val_change 未完成 caoqianming 2023-08-02 10:22:51 +0800
5402f2181c feat: 增加enstat 统计数据，优化task执行 caoqianming 2023-08-02 10:22:29 +0800
ab581f2851 fix: after_bulk_update执行后不用return caoqianming 2023-08-02 10:19:38 +0800
251e373d5b feat: get_total_hour_now 修改 caoqianming 2023-08-01 16:41:47 +0800
80b61c9f8b fix: get_total_hour_now bug caoqianming 2023-08-01 08:54:01 +0800
d2e4439b73 fix: get_total_hour_now bug caoqianming 2023-08-01 08:50:06 +0800
a29ed1edc8 fix: get_total_hour_now sql查询bug caoqianming 2023-07-31 17:46:56 +0800
8e3802966e feat: enstat参数计算并新建enstat2表 caoqianming 2023-07-28 17:36:44 +0800
6d5d2f84d4 feat: 停机记录分配到每一个班 caoqianming 2023-07-28 17:36:09 +0800
d487f0889f feat: 获取煤粉热值 caoqianming 2023-07-28 17:20:54 +0800
56bc87c913 feat: 启动时重新加载系统配置json caoqianming 2023-07-28 17:19:36 +0800
1d0b43d75f feat: sflog增加total_hour_now以及pcoal_val caoqianming 2023-07-28 17:18:59 +0800
a668ca0b2f feat: 返回数据增加belong_dept_name等 caoqianming 2023-07-25 14:24:21 +0800
841815bbb6 fix: 班月质检数据统计错误 caoqianming 2023-07-25 13:58:31 +0800
e64ae3aebe feat: goal返回goal_cata_name和mgroup_name caoqianming 2023-07-25 13:58:11 +0800
437d4c923e fix: init_test 报错 caoqianming 2023-07-25 13:25:05 +0800
887976363b fix: quastat update serializer caoqianming 2023-07-25 13:21:02 +0800
00677d100b feat: swagger显示问题 caoqianming 2023-07-25 11:33:33 +0800
b634bac616 feat: sflog获取年月日优化 caoqianming 2023-07-25 11:23:36 +0800
13382171de refector: 初始化检测录入优化 caoqianming 2023-07-25 11:20:27 +0800
be9011f8f5 feat: sflog增加property以获取年月日 caoqianming 2023-07-25 11:19:51 +0800
27fa035bea feat: 设置单个文件日志大小上限为2m caoqianming 2023-07-25 11:19:13 +0800
9f8cf21bf1 feat: 批量更新时after_bulk_update放在事务中处理 caoqianming 2023-07-25 11:17:34 +0800
7fde7148bf feat: 质检数据重新统计并放入enstat表中 caoqianming 2023-07-25 11:16:38 +0800
6c3cbf0c5e feat: 目标增加code查询条件 caoqianming 2023-07-25 11:14:32 +0800
e15cc2f9ce fix: enm以team做统计不是shift caoqianming 2023-07-25 11:13:54 +0800
6e98ec57ee feat: mpoint支持formular caoqianming 2023-07-24 16:03:06 +0800
27a2a20cbe feat: 值班记录增加运转时间和停机时间 caoqianming 2023-07-24 11:19:08 +0800
0abade21b7 feat: 质检统计增加班月month_sf caoqianming 2023-07-24 10:32:38 +0800
6df6b75499 feat: 同步质检表 caoqianming 2023-07-24 10:22:41 +0800
f4f9cb0fae feat: 质检统计增加班月 caoqianming 2023-07-24 10:22:06 +0800
2acd216d33 feat: eventcate code 不唯一 caoqianming 2023-07-19 17:24:45 +0800
16f560adc0 feat: 大华订阅增加移动侦测 caoqianming 2023-07-19 15:30:44 +0800
886843174d feat: tdevice 增加code查询条件 caoqianming 2023-07-19 10:20:07 +0800
5ba9789de2 fix: 计算优化待完成 caoqianming 2023-07-19 09:18:03 +0800
a8afccdfca feat: 增加month_sf统计维度, 优化二次计算逻辑 caoqianming 2023-07-18 14:15:52 +0800
f8bc2294f0 feat: 初步统计能管相关数据产量和成本 caoqianming 2023-07-17 15:33:35 +0800
3fbe3e7d0e fix: 保存last_tag_id以减少获取mplog caoqianming 2023-07-11 14:52:39 +0800
c3d0fa1806 feat: mgroups_allocate保存时带mgroup_name caoqianming 2023-07-11 14:29:32 +0800
c0e4b8a1b9 fix: 比例合计问题 caoqianming 2023-07-11 14:21:36 +0800
a30bffd244 fix: cal_mpointstat_manual 以班手动录入数据 caoqianming 2023-07-11 13:48:35 +0800
bf1ac0549e feat: mpointstat增加mgroup字段和相应逻辑 caoqianming 2023-07-11 13:46:37 +0800
c122335f8c feat: 支持测点数据反向分配给各工段 caoqianming 2023-07-11 10:53:28 +0800
f02135dc10 fix: init_test 排序错误 caoqianming 2023-07-10 16:26:23 +0800
a8576212a1 feat: 通过接口重新加载config caoqianming 2023-07-10 15:12:45 +0800
d2afb309b5 fix: 这里可能有问题 caoqianming 2023-07-10 14:55:10 +0800
e5fb485418 fix: RpjmemberCreateSerializer 的bug caoqianming 2023-07-10 14:13:34 +0800
caaeb32817 feat: 增加能耗统计记录表 caoqianming 2023-07-10 13:45:22 +0800
a49fc7abe9 feat: 重启时需要reload config caoqianming 2023-07-10 10:50:42 +0800
7af0447928 fix: cal_mpointstats 字符写错 caoqianming 2023-07-10 10:41:24 +0800
9f46722f48 fix: cal_mpointstat_manual 标注bug caoqianming 2023-07-10 10:20:24 +0800
2884becf3f feat: 测点统计任务优化 caoqianming 2023-07-10 10:13:45 +0800
56d9c50a39 fix: 非管理员不支持物理删除 caoqianming 2023-07-10 10:00:46 +0800
377817f04c feat: sflog增加查询参数已获取当前值班记录 caoqianming 2023-07-07 15:36:49 +0800
9d26946195 feat: bi exec查询参数校验 caoqianming 2023-07-07 15:36:06 +0800
31ec00ba55 fix: 提前离厂只检查最近日志 caoqianming 2023-07-07 12:59:37 +0800
9498e5eb22 feat: 测点统计记录支持手动创建 caoqianming 2023-07-06 17:03:28 +0800
ad0c3cdd7c fix: dataset validate默认sql_query为空/缺少查询参数提示 caoqianming 2023-07-06 16:58:04 +0800