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

Mono Color

• d4dc94df89 feat: edu paper添加type字段 caoqianming 2024-10-23 16:30:28 +0800
• 3343d30f77 feat: develop添加测试任务 caoqianming 2024-10-22 08:28:04 +0800
• 7b34ddd70c fix: 系统初始化时不必获取全部权限标识 caoqianming 2024-10-19 21:00:43 +0800
• 608a009737 fix: base permission获取优化 caoqianming 2024-10-20 10:46:06 +0800
• f02008f6de Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2024-10-20 10:46:08 +0800
• ca32d9f20f fix: base permission获取优化 caoqianming 2024-10-20 10:46:06 +0800
• ceefefcce5 feat: 添加gitignore项 caoqianming 2024-10-19 21:01:01 +0800
• ddc8d9fbbb fix: 系统初始化时不必获取全部权限标识 caoqianming 2024-10-19 21:00:43 +0800
• abeb70d166 feat: develop添加一个测试任务 caoqianming 2024-10-18 09:43:06 +0800
• f85db52ec7 fix: get_from_mioitem bug caoqianming 2024-10-17 15:55:26 +0800
• 27f7b3c076 feat: check_remployee_leave触发账户禁用 caoqianming 2024-10-17 13:39:45 +0800
• deb0cb48df fix: check_remployee_leave转task caoqianming 2024-10-17 11:12:29 +0800
• 7dd39d75bf fix: 相关方分配管理员重置岗位 caoqianming 2024-10-17 10:28:39 +0800
• dc3c11d3b6 fix: base get_alld_perms 传参 caoqianming 2024-10-09 14:18:11 +0800
• 1e82f73422 feat: base 优化permission缓存处理 caoqianming 2024-10-09 13:57:35 +0800
• e1bb844b99 fix: 处理冲突 caoqianming 2024-10-09 13:56:20 +0800
• bf2c330c0f feat: base 启动时缓存perms_alld_list caoqianming 2024-10-09 13:55:41 +0800
• 4b64903910 feat: base CustomGenericViewSet 初始化优化 caoqianming 2024-10-09 13:47:11 +0800
• 22e33c6d09 feat: base 添加全局线程池 caoqianming 2024-10-09 13:46:38 +0800
• 9117a8eb3a feat: base get_sysconfig可返回默认参数 caoqianming 2024-09-03 09:50:43 +0800
• 088ca737a6 feat: base 增加code分析工具类 caoqianming 2024-08-27 17:26:29 +0800
• 87080c76f2 feat: base dbconnection支持pg caoqianming 2024-08-27 17:26:05 +0800
• 933c45aad8 feat: base ptaskresult 更多filter caoqianming 2024-08-27 17:25:46 +0800
• b28174309a feat: 从车间库存明细获取物料标签 caoqianming 2024-10-16 11:13:25 +0800
• 46dd264dba Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server zty 2024-10-15 09:54:54 +0800
• e6e18c6c30 feat: enm/task nick_name zty 2024-10-15 09:54:24 +0800
• 3d7a9fb481 feat: labelmat 返回state_name caoqianming 2024-10-14 13:20:36 +0800
• af751f5a9d feat: 增加从车间库存明细获取物料标签 caoqianming 2024-10-14 09:09:25 +0800
• ebf3bbe257 feat: get_from_mb 返回更多信息 caoqianming 2024-10-11 15:54:19 +0800
• 0157daa0ab feat: 获取标签明细3 caoqianming 2024-10-11 15:41:55 +0800
• ef28e1ba47 feat: 获取标签明细2 caoqianming 2024-10-11 15:39:04 +0800
• 52a7d41518 feat: 获取标签明细 caoqianming 2024-10-11 15:38:28 +0800
• 419dbf3560 feat: 获取物料标签信息 caoqianming 2024-10-11 15:34:10 +0800
• 107818301f feat: 改变条码格式 caoqianming 2024-10-11 15:28:07 +0800
• c524d1b9a5 feat: 添加条码二维码管理的app caoqianming 2024-10-11 15:26:48 +0800
• c63c358d26 feat: base UserSignatureSerializer不依赖employee caoqianming 2024-10-11 14:53:59 +0800
• 8e918e9a7e Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2024-10-11 13:36:56 +0800
• ed8ee4e68d feat: materialbatch 添加supplier字段 caoqianming 2024-10-11 13:36:53 +0800
• 5203719023 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server zty 2024-10-10 13:34:16 +0800
• 96f4b0c445 feat: apps/enm 新增成本计算 zty 2024-10-10 13:33:58 +0800
• c546e25808 fix: base get_alld_perms 传参 caoqianming 2024-10-09 14:18:11 +0800
• f347630981 feat: base 优化permission缓存处理 caoqianming 2024-10-09 13:57:35 +0800
• bc77137093 feat: base perm变动时出发get_alld_perms caoqianming 2024-10-09 13:56:20 +0800
• 552055e6c5 feat: base 启动时缓存perms_alld_list caoqianming 2024-10-09 13:55:41 +0800
• 5e38f96925 feat: base CustomGenericViewSet 初始化优化 caoqianming 2024-10-09 13:47:11 +0800
• 71ac63bdaf feat: base 添加全局线程池 caoqianming 2024-10-09 13:46:38 +0800
• 74ece85b0a fix: import edge_tts 在函数中引入 zty 2024-10-09 10:00:46 +0800
• 7f9e2ad616 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server zty 2024-10-09 09:29:12 +0800
• 66af6475d9 feat: 修改采集时候出现0的处理 zty 2024-10-09 09:26:29 +0800
• 7c71eafa41 feat: 添加edge-tts语音生成 caoqianming 2024-10-08 15:10:59 +0800
• 494b078a09 feat: save_voice_and_speak 优化 caoqianming 2024-10-08 15:10:42 +0800
• 40c6479cf3 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2024-10-08 12:58:19 +0800
• 4f73aa2030 feat: 检查相关方人员门禁到期设为离职 caoqianming 2024-10-08 12:58:17 +0800
• 924d7f2b61 feat: 百度语音的配置 zty 2024-09-30 17:05:43 +0800
• 780564f6e1 feat: 煤粉热值处理2 zty 2024-09-30 16:22:30 +0800
• cc5b521f5d feat: 煤粉热值校正 zty 2024-09-30 16:21:44 +0800
• 9c6e8f5992 fix: 电表水表0值处理 zty 2024-09-30 16:21:18 +0800
• 956500d3aa fix :enm/serializer round zty 2024-09-26 15:56:18 +0800
• 9a3e15f926 feat: 优化mgroup_run_change zty 2024-09-26 11:51:36 +0800
• 9f90d84244 fix: em/bug zty 2024-09-26 11:02:59 +0800
• 7517da3e92 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server zty 2024-09-25 16:04:03 +0800
• 008219e9ba fix : em enm wpm 修改更新设备运行状态 zty 2024-09-25 16:03:59 +0800
• c0cb51a5b5 feat: utask生产任务提交 caoqianming 2024-09-25 13:24:48 +0800
• 73aa186293 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2024-09-24 10:24:53 +0800
• 49712b8211 feat: mio添加mgroup查询条件 caoqianming 2024-09-24 10:24:51 +0800
• dd3c0d6f6b Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server zty 2024-09-23 10:04:46 +0800
• d5e48c1ab8 fix: enm、fim 修改费用过滤和能源加入班组开始结束时间 zty 2024-09-23 10:04:43 +0800
• 8273a96597 fix: FtestWork 检验数据设置为非负整数 caoqianming 2024-09-20 09:16:03 +0800
• 5628a1ff83 feat: ftestwork增加校验 caoqianming 2024-09-19 15:08:54 +0800
• 305fda44c2 feat: wmaterialserializer 增加count_cando返回 caoqianming 2024-09-18 09:34:55 +0800
• 6c6a6ce440 fix: mtm/service note zty 2024-09-13 15:21:26 +0800
• 0453499ee5 add: new migrations file zty 2024-09-13 15:08:42 +0800
• 7aae49b378 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server zty 2024-09-13 13:41:29 +0800
• c4607e1608 fix /enm/service.py 停机时间短 无班组 加入异常原因 zty 2024-09-13 13:40:45 +0800
• f51bb48428 feat: handover serializer 优化 caoqianming 2024-09-13 12:53:55 +0800
• bc6406f12b fix: ana equip_last_mlog caoqianming 2024-09-12 17:23:40 +0800
• 2753c78997 feat: bi查询报错后打日志 caoqianming 2024-09-12 15:23:38 +0800
• 28e5b83896 fix: wmaterial 返回count_working3 caoqianming 2024-09-12 11:31:08 +0800
• 2d79796ccb fix: wmaterial 返回count_working2 caoqianming 2024-09-12 11:29:43 +0800
• 8f0e512654 fix: wmaterial 返回count_working caoqianming 2024-09-12 11:26:39 +0800
• de42dfc75f fix: wmaterial 返回count_working caoqianming 2024-09-12 11:24:56 +0800
• 7a8bee5e59 feat: wmaterial增加count_working proptey caoqianming 2024-09-12 11:19:00 +0800
• bc92e90765 feat: ftestwork 增加shift字段 caoqianming 2024-09-11 16:39:09 +0800
• 1caba24321 feat: ftestwork belong_dept默认test_user 所在部门 caoqianming 2024-09-11 16:20:34 +0800
• ca2103db8e fix: handover增加dept查询条件 caoqianming 2024-09-10 17:38:35 +0800
• 082619070e feat: handover增加dept查询条件 caoqianming 2024-09-10 17:06:56 +0800
• 18fe346661 fix: tran_time_to_mstate caoqianming 2024-09-10 15:12:14 +0800
• f3c31a5b39 feat: 投产分析接口 caoqianming 2024-09-10 08:50:30 +0800
• 1490a35a32 feat: 投产分析 caoqianming 2024-09-09 16:44:25 +0800
• 9a26529e0a feat: 完善equip_last_mlog5 caoqianming 2024-09-09 15:03:38 +0800
• 1b6e947492 feat: 完善equip_last_mlog4 caoqianming 2024-09-09 14:01:57 +0800
• 4d5195308f feat: 完善equip_last_mlog3 caoqianming 2024-09-09 13:52:51 +0800
• 9ffe025ef7 feat: 完善equip_last_mlog2 caoqianming 2024-09-09 13:49:35 +0800
• 768f7a9a22 feat: 完善equip_last_mlog caoqianming 2024-09-09 13:33:48 +0800
• d940c82e34 fix: tran_time_to_mstate caoqianming 2024-09-09 13:21:42 +0800
• 1f8bdd0461 feat: 增加wpm 数据分析 caoqianming 2024-09-09 10:48:53 +0800
• 01cff014ff feat: 增加wpm datax caoqianming 2024-09-08 14:33:09 +0800
• bb270d7105 feat: inm mio相关增加inout_date校验 caoqianming 2024-09-08 14:32:49 +0800
• c07d0666c0 fix: handoverb返回更多信息 caoqianming 2024-09-06 11:30:43 +0800
• 4e5d16f7f6 feat: handoverb返回更多信息 caoqianming 2024-09-06 11:26:31 +0800