Commit Graph

Select branches

Hide Pull Requests

base

dev_cqm

dev_sj

master

#2

#3

#4

#5

#6

#7

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

3.1.2026033008

3.1.2026042912

Mono Color

• 095a6f9d51 feat: enm/task view 修改校正测试 增加能修改 天和月的时间类型 zty 2025-02-17 15:35:21 +0800
• 9f558acedb feat: base execute_raw_sql时允许不返回值 caoqianming 2025-02-17 14:37:30 +0800
• 57e6e23e95 feat: equip添加采集数据请求字段 caoqianming 2025-02-17 14:35:43 +0800
• 8cbb921969 feat: 光子棒管综合统计添加数据 caoqianming 2025-02-17 11:24:43 +0800
• e6b27950b2 feat: ftestitem增加检测设备字段 caoqianming 2025-02-17 09:34:48 +0800
• 61525d236e feat: qct detail是检测项按顺序返回 caoqianming 2025-02-14 10:56:40 +0800
• d7361a71df perf: 优化has_envdata的sql查询2 caoqianming 2025-02-13 13:26:32 +0800
• 61f9dc3b51 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2025-02-13 11:26:30 +0800
• dbbdaa89b9 perf: 优化has_envdata的sql查询 caoqianming 2025-02-13 11:26:27 +0800
• 5ecb3341e0 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server zty 2025-02-12 17:34:09 +0800
• 5f85d0273c feat: 修改enm/task zty 2025-02-12 17:34:04 +0800
• 9d27ccd1dc fix: base get_user_route 路由重复的问题 caoqianming 2025-02-12 15:10:20 +0800
• 861bb03469 feat: wpmw添加字段 caoqianming 2025-02-12 15:10:00 +0800
• fd5130e4b3 feat: 修改系统名称 caoqianming 2025-02-11 15:25:08 +0800
• a88f7e282e feat: Ptest不指定testitem caoqianming 2025-02-11 14:53:26 +0800
• 7dc11e032d Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2025-02-11 14:40:41 +0800
• ac41f5a105 fix: 粗中细磨的统计要涵盖粗磨和粗中磨的数据 caoqianming 2025-02-11 14:40:38 +0800
• f7d6f59fcd feat: 修改 enm 回转窑产量计算 zty 2025-02-11 14:24:59 +0800
• 44486b64a3 feat: mlogbw的输出不允许删除 caoqianming 2025-02-11 11:12:14 +0800
• edfc63a2e2 feat: base 修改系统名称 caoqianming 2025-02-10 18:19:20 +0800
• f8416d91b6 feat: 增加mio返回is_tested caoqianming 2025-02-10 18:19:06 +0800
• b8c0a9b420 fix: 车间执行人和仓库人问题 caoqianming 2025-02-10 15:57:40 +0800
• 239692cbd6 feat: ops添加celery状态监控 caoqianming 2025-02-08 17:31:49 +0800
• 0eb0100e60 fix: auth get_user_by_username_or caoqianming 2025-02-08 16:57:38 +0800
• 1a3e428195 feat: do_in 支持wpr caoqianming 2025-02-08 15:31:35 +0800
• 33f162fa3a fix: do_in 的bug caoqianming 2025-02-08 14:49:30 +0800
• 8838227919 feat: wpr增加查询条件 caoqianming 2025-02-08 14:26:21 +0800
• 957938f8dd feat: mpoint添加search字段 caoqianming 2025-02-08 11:09:58 +0800
• ff4bdf027f fix: equip_last_mlog 添加运行状态 caoqianming 2025-02-08 10:53:23 +0800
• 5b7b1bf276 fix: 获取可交接到的工段进行去重 caoqianming 2025-02-08 09:45:05 +0800
• 2843905def feat: 默认密码从conf中读取 caoqianming 2025-02-08 09:36:39 +0800
• 00ac0d8a00 feat: 默认密码从conf中读取 caoqianming 2025-02-08 09:36:39 +0800
• fd634a98be feat: base 短信发送读取配置 caoqianming 2025-02-05 17:24:08 +0800
• 5df5c7bf58 fix: base CustomRetrieveModelMixin支持添加add_info caoqianming 2024-12-31 15:31:54 +0800
• e894cf93c8 fix: base safe_get_or_create使用分布式锁 caoqianming 2024-12-31 15:28:28 +0800
• 263efb3a82 fix: 优化safe_get_or_create以处理并发4 caoqianming 2024-12-31 09:18:01 +0800
• d95bb8468b fix: 优化safe_get_or_create以处理并发3 caoqianming 2024-12-30 17:48:21 +0800
• 446714bf00 fix: 优化safe_get_or_create以处理并发2 caoqianming 2024-12-30 14:28:38 +0800
• 28c72e01b9 feat: base 优化safe_get_or_create以处理并发 caoqianming 2024-12-30 10:24:12 +0800
• c5d8f70251 feat: 优化safe_get_or_create以处理并发 caoqianming 2024-12-29 11:31:22 +0800
• 3ef3607220 feat: 增加safe_get_or_create方法 caoqianming 2024-12-24 21:58:53 +0800
• 3045b46d77 feat: base listmixin描述去除 caoqianming 2024-12-19 11:07:08 +0800
• b2b8b2aa17 feat: base get_user_route 排除route_name为空的 caoqianming 2024-12-16 17:02:54 +0800
• 20f0265c14 feat: get_user_route 排除path为空的 caoqianming 2024-12-16 16:51:53 +0800
• 800b4fc27c feat: 调整permission以支持后端路由2 caoqianming 2024-12-16 08:50:48 +0800
• 05c20c10bc feat: 调整permission以支持后端路由 caoqianming 2024-12-13 13:01:10 +0800
• 6c73245c03 feat: 增加userfullinfoserializer caoqianming 2024-12-13 12:59:20 +0800
• 1d34df1985 feat: base 使用缓存处理session及csrf适应 caoqianming 2024-12-10 18:52:51 +0800
• 085cf20b1a feat: base 使用缓存处理session caoqianming 2024-12-10 18:38:11 +0800
• cc630cb6be feat: base 对登录失败次数过多做限制 处理冲突 caoqianming 2024-12-05 14:47:38 +0800
• c2a1ae661d feat: base 支持树型的递归分页查询以传with_children参数 caoqianming 2024-11-07 17:50:48 +0800
• 550a3281bc fix: 获取可交接到的工段2 caoqianming 2025-02-07 13:34:25 +0800
• 2488e500ce fix: 获取可交接到的工段 caoqianming 2025-02-07 10:12:27 +0800
• b96846d2c0 feat: 获取可交接到的工段 caoqianming 2025-02-07 10:04:12 +0800
• 622d594795 feat: 优化mloginit报错提示 caoqianming 2025-02-06 16:56:06 +0800
• 77a50ae162 feat: route添加material筛选条件 caoqianming 2025-02-06 16:40:42 +0800
• 1b2f201786 feat: 入厂和作业时进行证书过期校验 caoqianming 2025-02-06 09:21:20 +0800
• 171348fbbd feat: base 短信发送读取配置 caoqianming 2025-02-05 17:24:08 +0800
• b1a574051c feat: examrecord添加查询条件 caoqianming 2025-02-05 17:19:58 +0800
• 6cd55f8460 feat: certificate添加state字段及其处理 caoqianming 2025-02-05 14:41:32 +0800
• 821b88eb90 feat: handover submit支持改版 caoqianming 2025-02-05 10:55:21 +0800
• 66e4273b97 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2025-02-05 09:54:31 +0800
• 8a2e409c8a feat: 增加改版交接类型 caoqianming 2025-02-05 09:54:22 +0800
• abf50b97b8 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server zty 2025-02-05 09:20:49 +0800
• 2f46f9e31a feat: 修改qm 增加rate_pass 目标值 zty 2025-02-05 09:20:47 +0800
• 7740613cf7 feat: testitem删除校验 caoqianming 2025-01-24 16:19:59 +0800
• 1d22dd983a feat: qm/ task view 增加 rate_pass_t 设置合格率目标值 zty 2025-01-23 11:15:25 +0800
• f88689cc1e feat: 增加addto_wpr字段配置以在wpr表里添加额外信息 caoqianming 2025-01-22 13:51:03 +0800
• 3e93fce213 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2025-01-22 10:15:07 +0800
• 89449eb7c6 feat: mlogbin 只校验主批是否重复 caoqianming 2025-01-22 10:14:49 +0800
• e0f7ce4636 feat: qm 合格率设置阈值 zty 2025-01-21 15:15:24 +0800
• 4254e226d3 feat: enm/view 修改correct 增加不能校正当日或当月数据 zty 2025-01-21 12:45:51 +0800
• fa18fee720 feat：remove 碳排放强度计算和字段 zty 2025-01-21 09:40:52 +0800
• bec6600089 feat: enm/model 增加碳排放强度 和 碳排放量字段与 task 计算逻辑 zty 2025-01-21 09:24:58 +0800
• 4927afa9b7 feat: 工艺路线复制按钮 caoqianming 2025-01-20 15:43:04 +0800
• 688b3fc3d1 feat: ftest增加筛选条件 caoqianming 2025-01-20 13:51:13 +0800
• fd5747f99c feat: wpr change时变更defectbug caoqianming 2025-01-20 11:03:25 +0800
• 4b7ee277f1 feat: 撤回时部分恢复缺陷项 caoqianming 2025-01-20 10:55:10 +0800
• 50f19291a0 fix: mlog revert bug caoqianming 2025-01-20 10:45:10 +0800
• 1eb990d3d5 fix: mlogbw submit错误 caoqianming 2025-01-20 10:33:44 +0800
• f004417d49 fix: ftest增加defect_main的后续逻辑变更 bug caoqianming 2025-01-17 17:18:26 +0800
• 4699b31f83 feat: ftest增加defect_main的后续逻辑变更 caoqianming 2025-01-17 16:52:14 +0800
• 6737d3f0f4 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2025-01-17 16:38:28 +0800
• d9a5720cc6 feat: ftest添加主要缺陷字段 caoqianming 2025-01-17 16:38:15 +0800
• cd652f3696 feat:enm/service 修改translate_eval_formula zty 2025-01-17 16:08:27 +0800
• 805d4ac4fe fix: 切分融合的单件生成2 caoqianming 2025-01-17 15:42:24 +0800
• 5b7f8e1359 fix: 切分融合的单件生成 caoqianming 2025-01-17 14:54:09 +0800
• 713c51bdbd feat: 切分融合的单件生成 caoqianming 2025-01-17 14:45:31 +0800
• 6bcafcad3a fix: 变更单件产品的属性问题3 caoqianming 2025-01-17 10:19:58 +0800
• d653caed1d fix: 变更单件产品的属性问题2 caoqianming 2025-01-17 10:01:02 +0800
• 8b7887ec43 fix: 变更单件产品的属性问题 caoqianming 2025-01-17 09:57:53 +0800
• 7605574f37 fix: update_mb_item bug caoqianming 2025-01-17 09:29:33 +0800
• 7382eed0b6 fix: 修改mioitemw的外键名字 caoqianming 2025-01-17 08:58:44 +0800
• 31f2fdde84 fix: 采购入库支持检验3 caoqianming 2025-01-16 17:30:53 +0800
• 2f259bd5f3 feat: 采购入库支持检验2 caoqianming 2025-01-16 17:15:38 +0800
• 8bcd6b4f69 feat: 采购入库支持检验 caoqianming 2025-01-16 17:09:01 +0800
• adf3341f4b feat: testitem添加process查询条件 caoqianming 2025-01-16 15:27:47 +0800
• ae2ba421f8 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2025-01-16 15:01:02 +0800
• 13418e9b1a feat: ftest增加筛选mlogbw_ftest__wpr caoqianming 2025-01-16 15:00:42 +0800
• ae5cf55e9b Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server zty 2025-01-16 13:56:24 +0800