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

15db992dff refetor: 修改get_ticket_sn 参数type caoqianming 2023-06-03 16:56:02 +0800
5d7880ca64 fix: opl ticket 撤回时支持修改oplworker gascheck caoqianming 2023-06-03 16:33:25 +0800
46b0638bfb feat: 添加enm app caoqianming 2023-06-02 17:50:41 +0800
5ded2347b7 feat: 更改部分系统配置为json自定义 caoqianming 2023-06-01 17:12:07 +0800
313005eb5c refector: tlog查看权限放开 caoqianming 2023-05-31 16:49:46 +0800
ae071d1d9c perf: dataset exec 缓存优化 caoqianming 2023-05-31 09:19:32 +0800
8a1d43b7b8 refector: 删除相关方时将该部门的账户禁用 caoqianming 2023-05-29 09:06:09 +0800
a3d9fe4606 feat: 报表模块基础开发 caoqianming 2023-05-26 13:02:43 +0800
a1efcb46da fix: 事件删除权限 caoqianming 2023-05-25 17:12:22 +0800
515952ef8d fix: 管理员返回所有权限代号 caoqianming 2023-05-25 11:19:23 +0800
71167db85e feat: 更改系统版本 caoqianming 2023-05-25 10:52:22 +0800
2d2edc1ab3 fix: 管理员返回所有权限代号 caoqianming 2023-05-25 10:51:39 +0800
b338cbc34c refector: 如果超出时间不检查人员未就位 caoqianming 2023-05-25 10:46:31 +0800
5131daa5cd feat: 接口增加默认缓存时间 caoqianming 2023-05-25 10:45:41 +0800
3d9f04a443 refector: 管理员返回所有权限代号 caoqianming 2023-05-25 10:44:05 +0800
863a301cb8 refector: visit audit end 修改司机入厂逻辑 caoqianming 2023-05-24 17:35:51 +0800
9dff134329 fix: algo channel 添加bug caoqianming 2023-05-24 17:19:32 +0800
936af7c4fe feat: 开始添加设备管理模块 caoqianming 2023-05-22 15:55:32 +0800
b1ded623fa feat: 增加报表模块 caoqianming 2023-05-11 16:20:36 +0800
4e6f4b249b fix: while 循环做card_door_authority的提高补偿机制次数 caoqianming 2023-05-09 17:02:41 +0800
eeca896a78 fix: 紧急bug caoqianming 2023-05-09 09:52:54 +0800
25e56b4bd0 feat: 查询用户列表可返回更详细的定位信息 caoqianming 2023-05-09 09:51:28 +0800
ef95b3c51f feat: 查询用户列表可返回更详细的定位信息 caoqianming 2023-05-09 09:46:44 +0800
b38e4860ac refector: 缓存区域信息带名字 caoqianming 2023-05-09 09:42:02 +0800
702ef7641c fix: while 循环做card_door_authority的补偿机制4 caoqianming 2023-05-09 08:46:02 +0800
ca1a426182 fix: while 循环做card_door_authority的补偿机制3 caoqianming 2023-05-09 08:34:45 +0800
a395817028 fix: while 循环做card_door_authority的补偿机制2 caoqianming 2023-05-08 18:14:57 +0800
8d3d1934b7 fix: while 循环做card_door_authority的补偿机制 caoqianming 2023-05-08 15:51:05 +0800
f59426b426 fix: 后入厂时的reason pop出 caoqianming 2023-05-06 13:20:07 +0800
33cc805172 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2023-05-05 09:40:24 +0800
b1ec172829 refector: 尝试访问卡片以确保卡片生成 caoqianming 2023-05-05 09:40:20 +0800
923e812890 fix: ep update 不放在事务中 caoqianming 2023-04-27 14:43:01 +0800
c2c05a5075 fix: opl level可为空 caoqianming 2023-04-27 14:42:33 +0800
e6933f9fc4 fix: rpjmember update rpj获取错误 caoqianming 2023-04-27 11:31:01 +0800
7128e67e92 fix: 人员导出excel信息bug caoqianming 2023-04-19 19:29:18 +0800
bc6aa5cacc fix: 人员导出excel信息bug caoqianming 2023-04-19 19:25:39 +0800
9192d9ffda fix: 人员导出excel信息bug caoqianming 2023-04-19 19:20:52 +0800
aefd513987 fix: swipe_next exception_type 保存bug caoqianming 2023-04-19 18:43:49 +0800
6a0929dc10 fix: swipe_next还是通过save,这样可见update_time 变动 caoqianming 2023-04-19 17:36:10 +0800
aa84d50957 feat: employee导出并增加是否有定位卡的筛选 caoqianming 2023-04-18 19:34:03 +0800
3410f5d968 feat: MySchedule创建时自动获取汉语描述 caoqianming 2023-04-18 18:10:50 +0800
0303184ceb feat: 阿里云短信加入auto_log装饰器 caoqianming 2023-04-17 08:21:07 +0800
1c661631ea fix: 加签和加签完成接口需要校验 caoqianming 2023-04-17 00:05:32 +0800
a757321f5c fix: 解决cache_areas_info重复执行的问题 caoqianming 2023-04-15 21:10:16 +0800
c4805c8d8e fix: 相关方中途入厂时因事务引发的bug caoqianming 2023-04-15 21:02:33 +0800
3af691844b fix: rpj_member_leave 中更新当前入厂项目bug caoqianming 2023-04-15 18:25:19 +0800
59e89c19ba fix: 解决cache_areas_info重复执行的问题 caoqianming 2023-04-15 17:54:18 +0800
64bdd72146 fix: snap_and_analyse时更新缓存 caoqianming 2023-04-15 17:32:58 +0800
284a36e24c fix: snap_and_analyse时更新缓存 caoqianming 2023-04-15 17:32:44 +0800
0b1323b41d feat: 支持开启服务侧算力监控 caoqianming 2023-04-14 17:20:32 +0800
ba937ce751 refector: 一点优化 caoqianming 2023-04-14 16:54:10 +0800
65ff80db75 refector: 工作流脚本每次失败都记录日志 caoqianming 2023-04-14 16:53:35 +0800
2d2f171c32 feat: tdevice 视频通道查询带third_info caoqianming 2023-04-14 16:26:21 +0800
03ac2a5b1b refector: 命名修改 caoqianming 2023-04-14 16:24:56 +0800
d9c318de8e refector: 证书检索条件 caoqianming 2023-04-13 17:16:46 +0800
c097b44e0c fix: 文件上传不做幂等操作 caoqianming 2023-04-13 09:45:13 +0800
50553bd0c0 fix: swip_next bug caoqianming 2023-04-13 08:01:11 +0800
005919af19 fix: 直接请求user列表不应该返回删除的用户 caoqianming 2023-04-12 18:03:24 +0800
68c54a73e3 refector: swipe_next 优化2 caoqianming 2023-04-12 17:10:38 +0800
f4aacc2129 refector: swipe_next 优化 caoqianming 2023-04-12 17:06:38 +0800
1b55669a82 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2023-04-12 15:56:55 +0800
8f2bea554f feat: 摄像头支持随时开启算法监控(每10s拍照) caoqianming 2023-04-12 15:56:50 +0800
eea05cf6f3 refector: 事件处理取消一些限制 caoqianming 2023-04-12 15:50:58 +0800
2b054107c0 fix: 非工单节点下的流转不继续 caoqianming 2023-04-12 14:20:48 +0800
14dc063f59 refector: post请求进行幂等操作 caoqianming 2023-04-12 14:19:18 +0800
0bb351fb99 fix: 修改opl level字段默认为空字符 caoqianming 2023-04-12 14:18:23 +0800
9d68a7006e refector: 修改dpm字段 caoqianming 2023-04-12 14:17:45 +0800
8fd9fef177 fix: 自动流转时transition_obj不能为空 caoqianming 2023-04-11 20:44:23 +0800
557f95e4cf fix: 权限cache维持300s caoqianming 2023-04-10 14:57:41 +0800
731c93ce71 fix: get_user_perms_map 中 data_range取最小值 caoqianming 2023-04-10 14:56:41 +0800
1a61e5ab27 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2023-04-07 15:06:30 +0800
121d6ec15c feat: 增加相关方黑名单 caoqianming 2023-04-07 15:06:26 +0800
a6f5137dff fix: close_visit_by_leave_time 待入厂也应正常关闭 caoqianming 2023-04-05 10:15:05 +0800
8df57ed99a refector: 开启关闭监控加入日志记录 caoqianming 2023-04-05 10:04:35 +0800
96c12108e0 fix: 工单流水号bug caoqianming 2023-04-03 14:53:40 +0800
4c4e637cc3 fix: rparty delete同步dept caoqianming 2023-04-03 14:01:38 +0800
7cbd581701 fix: rparty create时dept字段冲突2 caoqianming 2023-04-03 13:35:54 +0800
cd3a0393ad fix: 生成工单流水号bug caoqianming 2023-04-03 13:19:06 +0800
3baa41b504 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2023-04-03 12:44:17 +0800
ec6c1c3d84 fix: rparty create时dept字段冲突 caoqianming 2023-04-03 12:44:13 +0800
be530ca9b9 fix: am config修改 caoqianming 2023-04-02 10:18:24 +0800
e32f82ace7 refector: send_mail_task优化 caoqianming 2023-03-31 23:16:40 +0800
f2c02a76d4 refector: send_mail_task优化 caoqianming 2023-03-31 10:14:01 +0800
407068670c refector: celery settings修改 caoqianming 2023-03-30 17:38:06 +0800
876c7734f1 refector: 工单 bind_x 优化 caoqianming 2023-03-30 12:22:13 +0800
a415859a26 fix: 许可证在工单撤回状态下可以编辑 caoqianming 2023-03-30 11:13:35 +0800
201eabf33e fix: filter_dept字段长度修改 caoqianming 2023-03-30 10:08:49 +0800
ebcef8721f fix: clock record view加入权限控制 caoqianming 2023-03-29 16:53:03 +0800
0766cba363 Merge branch 'v2' caoqianming 2023-03-29 16:36:03 +0800
7908b06cd1 fix: opl monitor不用celery caoqianming 2023-03-29 10:22:41 +0800
9b0de2e011 refector: user is_active用is_deleted统一处理 caoqianming 2023-03-28 10:46:34 +0800
6d1c9e03c9 refector: 短信发送备用渠道,未写 caoqianming 2023-03-28 09:51:30 +0800
76ce412741 fix: close_rpj_by_leave_time 执行 rpj_m_leave caoqianming 2023-03-27 13:03:50 +0800
a046fa46f0 fix: 打卡记录导出bug2 caoqianming 2023-03-24 17:52:37 +0800
e0210c4bef fix: 打卡记录导出bug caoqianming 2023-03-24 17:49:33 +0800
1ed0a2542e fix: 入厂后账户启用 caoqianming 2023-03-24 17:34:42 +0800
49abd43cf3 fix: 该项目成员已做离厂操作 caoqianming 2023-03-24 16:39:21 +0800
ce90e11c36 fix: idempotent 加入request_path caoqianming 2023-03-24 16:38:51 +0800
503953bb11 fix: 成员离厂有限制2 caoqianming 2023-03-24 16:23:56 +0800
1966dde2c0 fix: 成员离厂有限制2 caoqianming 2023-03-24 16:20:50 +0800