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

3.0.2025110710

3.0.2025122514

3.0.2026010716

3.1.2026031316

4eb8aeca96 feat: qct增加筛选条件 caoqianming 2024-12-23 10:52:14 +0800
f4c84f0354 feat: testitem add_info_for_list caoqianming 2024-12-20 17:49:40 +0800
4ab711cc71 feat: formula 调整到testitem caoqianming 2024-12-20 15:46:32 +0800
7fa065ce88 feat: QctTestItem 增加字段 caoqianming 2024-12-20 14:42:03 +0800
b289c7813e feat: qct 重构 caoqianming 2024-12-19 15:10:12 +0800
796cdbc615 feat: base listmixin描述去除 caoqianming 2024-12-19 11:07:08 +0800
1647b2f06e fix: 增加检测模板功能字段 bug caoqianming 2024-12-19 11:04:16 +0800
e7c08dc16c fix: 增加检测模板功能QctItemSerializer bug caoqianming 2024-12-19 10:12:24 +0800
468f5ffdbf feat: 增加检测模板功能 caoqianming 2024-12-19 10:11:27 +0800
c58be8cdc3 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2024-12-18 14:53:33 +0800
ddb517d1f8 feat: material增加tracking字段 caoqianming 2024-12-18 14:53:21 +0800
c08dff56bf Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server zty 2024-12-18 14:16:14 +0800
0df2506f26 feat: 修改 enm/qua_data 排序问题 zty 2024-12-18 14:16:11 +0800
e62f7e5a9c feat: cal_real_task_count 纳入div_number caoqianming 2024-12-18 11:08:42 +0800
92145451e3 feat: route增加div_number字段3 caoqianming 2024-12-18 09:08:25 +0800
2a5926f95b feat: route增加div_number字段2 caoqianming 2024-12-18 09:06:55 +0800
f653c2c191 feat: route增加div_number字段 caoqianming 2024-12-18 09:06:11 +0800
7937a632a0 feat: process增加mtype caoqianming 2024-12-17 17:20:54 +0800
7d2d74ee80 feat: 日志操作时对有ticket的进行处理 caoqianming 2024-12-17 13:37:22 +0800
c3338d05c2 feat：ftestwork_audit_end时get_alldata_with_batch_and_store caoqianming 2024-12-17 13:31:53 +0800
7ad5bad137 feat: defect create update时进行限制 caoqianming 2024-12-17 13:28:29 +0800
9a14216b78 feat: qm增加defect caoqianming 2024-12-17 09:42:11 +0800
8928c0b7aa feat: base get_user_route 排除route_name为空的 caoqianming 2024-12-16 17:02:54 +0800
c0136400d6 feat: get_user_route 排除path为空的 caoqianming 2024-12-16 16:51:53 +0800
bdd644a527 fix: 日志撤销的同时将任务变更状态 caoqianming 2024-12-16 13:06:02 +0800
7e578b52c2 feat: 调整permission以支持后端路由2 caoqianming 2024-12-16 08:50:48 +0800
28d89176e6 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2024-12-13 18:09:45 +0800
5572b4cb0f feat: enstat update权限 caoqianming 2024-12-13 18:09:29 +0800
c1e958f2f9 feat: enstate note makemigration zty 2024-12-13 17:46:28 +0800
d364a0ae1e fix: enstatupdateserializer zty 2024-12-13 17:41:50 +0800
15950dacf9 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server zty 2024-12-13 17:32:59 +0800
cdc70177bb fix: sflog work_date 默认start_time.date zty 2024-12-13 17:32:56 +0800
005b5c1057 feat: 增加enstat note字段 caoqianming 2024-12-13 17:05:02 +0800
e331002538 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server zty 2024-12-13 15:29:13 +0800
62a177b773 feat:登入记录IP 和增加每日的能源统计定时任务 zty 2024-12-13 15:29:10 +0800
da54222e20 feat: 调整permission以支持后端路由 caoqianming 2024-12-13 13:01:10 +0800
a2f676e58c feat: 增加userfullinfoserializer caoqianming 2024-12-13 12:59:20 +0800
1a296e8e30 feat: process添加工序类型 caoqianming 2024-12-12 15:17:26 +0800
765bcc39de feat: ftestwork添加ticket审批并编写绑定函数 caoqianming 2024-12-12 14:42:50 +0800
a432dca39b feat: mgroup添加查询条件 caoqianming 2024-12-12 11:18:07 +0800
80fd2090ad feat: 工段添加code标识 caoqianming 2024-12-12 11:10:01 +0800
0f920bae99 feat: 信号更新设备状态冲突时优先处理监测设备 caoqianming 2024-12-12 09:28:08 +0800
6ecf61706a feat: 优化cal_exp_duration_sec caoqianming 2024-12-11 18:16:03 +0800
aadb9fdf2c feat: mpoint增加is_rep_ep0_running_state字段 caoqianming 2024-12-11 18:14:08 +0800
c79cc14f46 feat: mpoint增加is_rep_ep0_running_state字段 caoqianming 2024-12-11 17:54:45 +0800
41b27c0113 feat: sflog save 保存team leader caoqianming 2024-12-11 13:03:29 +0800
13639568b1 feat: 回退make_sflogs中start_time缺班bug caoqianming 2024-12-11 12:58:55 +0800
6815babe0f feat: get_team_x bug caoqianming 2024-12-11 12:45:57 +0800
4791716ec9 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server zty 2024-12-11 12:18:11 +0800
44af9bc494 feat : 修改排班规则 zty 2024-12-11 12:18:09 +0800
d349970a47 doc: 删除一部分print语句 caoqianming 2024-12-11 08:41:35 +0800
9f052d1fdd feat: base 使用缓存处理session及csrf适应 caoqianming 2024-12-10 18:52:51 +0800
043193eda7 feat: base 使用缓存处理session caoqianming 2024-12-10 18:38:11 +0800
e6cad72807 feat: enm 增加氨水消耗量 zty 2024-12-10 14:12:16 +0800
e0915676e3 feat: enm/view service 修改聚合和煤粉热值缓存失效时间。 zty 2024-12-09 09:46:51 +0800
1b3bfabd55 feat: mpoint增加查询条件 caoqianming 2024-12-06 19:26:38 +0800
2f35b78604 feat: 调整enstat和mpointstat排序 caoqianming 2024-12-06 18:23:44 +0800
6da1b14e7b feat: stlog部分字段设置为非必填 caoqianming 2024-12-06 17:59:28 +0800
05beed5146 feat: enm enstat调整一下排序 caoqianming 2024-12-06 17:26:08 +0800
152b0b5a3a feat: 忽略10s内的停机 caoqianming 2024-12-06 17:24:07 +0800
3cfc4393de feat: mpointvalues 聚合查询bug caoqianming 2024-12-06 15:05:06 +0800
9c0160f556 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2024-12-06 14:46:28 +0800
0cf481a69b feat: enm end_time 查询包前不包后 caoqianming 2024-12-06 14:46:26 +0800
3901a57986 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server zty 2024-12-06 13:55:50 +0800
8c059fabe4 feat: enm/view 增加一个返回字段（峰谷平用） zty 2024-12-06 13:55:47 +0800
438406842d feat: enstat提供排序条件2 caoqianming 2024-12-06 13:25:36 +0800
3ba0ddaaa9 feat: enstat提供排序条件 caoqianming 2024-12-06 13:24:06 +0800
a464ee6ecf feat: Equip filter增加state_measure2 caoqianming 2024-12-06 11:12:12 +0800
f8976e9fe8 feat: Equip filter增加state_measure caoqianming 2024-12-06 10:50:08 +0800
17622f230e feat: 根据排班规则填入班组 caoqianming 2024-12-05 18:59:55 +0800
2b10f3bfff Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server zty 2024-12-05 18:20:01 +0800
4c732894df feat: wpm 排班修改 zty 2024-12-05 18:19:58 +0800
15de6e3a5e feat: srule list 返回rule_display caoqianming 2024-12-05 18:13:11 +0800
22abc35d4b Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server zty 2024-12-05 15:22:35 +0800
918df6b345 feat: 新增tkx 测点聚合 zty 2024-12-05 15:22:33 +0800
62fae4ceac feat: mpoint增加筛选条件 caoqianming 2024-12-05 15:09:27 +0800
1042deb817 feat: base 对登录失败次数过多做限制 caoqianming 2024-12-05 14:47:38 +0800
15d37604ea Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server zty 2024-12-04 16:08:47 +0800
c4c50670fd feat: 修改 tkx 峰谷平 zty 2024-12-04 16:08:43 +0800
5e9ebcdd36 feat: 产品规格还需在管料退火处处理 caoqianming 2024-12-04 13:04:19 +0800
7ce9ed5a19 fix: get_alldata_with_batch hanle_user bug caoqianming 2024-12-04 12:42:12 +0800
784500bf5b feat: get_alldata_with_batch 其他入库也需要记录产品规格 caoqianming 2024-12-04 12:37:08 +0800
a69f718859 feat: mlog 支持handle_user 默认create_by caoqianming 2024-12-04 12:22:52 +0800
5533cc6967 fix: get_alldata_with_batch 加入检验备注统计 caoqianming 2024-12-04 11:18:23 +0800
ffd7bc13b0 feat: get_alldata_with_batch 加入检验备注统计 caoqianming 2024-12-04 11:00:49 +0800
bcbaba330d feat: batchst增加batch__startswith__in筛选条件 caoqianming 2024-12-04 10:16:41 +0800
cbaf79084c fix: em回退到0021 zty 2024-12-04 09:58:53 +0800
ca08fb5c20 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server zty 2024-12-03 18:27:51 +0800
284dc01f69 add : enm/filter 增加峰谷平查询字段 zty 2024-12-03 18:27:48 +0800
b2c28e1a88 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2024-12-03 18:07:35 +0800
b93c4bddeb feat: 触发批次分析统计 caoqianming 2024-12-03 18:07:23 +0800
6f3b418265 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server zty 2024-12-03 18:02:21 +0800
55b8564f0d feat:tkx 计量设备临期预警 zty 2024-12-03 18:02:17 +0800
67be714355 fix: 完善get_alldata_with_batch -改_ caoqianming 2024-12-03 11:41:23 +0800
91bc99a135 fix: 完善get_alldata_with_batch4 caoqianming 2024-12-03 11:13:55 +0800
4253b39cc6 fix: 完善get_alldata_with_batch3 caoqianming 2024-12-03 11:06:01 +0800
7e44cda500 fix: 完善get_alldata_with_batch caoqianming 2024-12-03 11:02:55 +0800
fb43bdde85 feat: 完善get_alldata_with_batch caoqianming 2024-12-03 10:36:23 +0800
a08e66a06a fix： task bug 修字段名 zty 2024-12-02 15:36:36 +0800
c0169d25ac add : enm 增加峰谷平电量统计 zty 2024-12-02 15:26:12 +0800