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

• d9a1512a92 feat: 定义batchst默认排序为batch caoqianming 2024-12-02 14:33:44 +0800
• bc6baca698 fix: batchst last_time取用错误 caoqianming 2024-12-02 14:20:54 +0800
• de6e5d315a feat: 记录batchst 最后操作时间 caoqianming 2024-12-02 14:13:17 +0800
• 17697d6482 feat: 添加batchst路由 caoqianming 2024-12-02 13:39:43 +0800
• c3bd32ee68 feat: property改为classmethod caoqianming 2024-12-02 13:13:28 +0800
• 8435b35be6 feat: get_alldata_with_batch caoqianming 2024-12-02 12:27:26 +0800
• ab52c033dc Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2024-11-28 17:06:58 +0800
• 6396eff968 feat: fmlog 移除route字段 caoqianming 2024-11-28 17:06:42 +0800
• 2f31997b43 feat: enm/task 修改报警事件 zty 2024-11-28 16:13:00 +0800
• 4671ee9e7a Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server zty 2024-11-28 14:28:26 +0800
• 4c38cee983 add: mtm/model serializer view 增加tkx 自动排班 zty 2024-11-28 14:28:24 +0800
• 31b1aae03c feat: generate_new_batch 追加锅号 caoqianming 2024-11-28 09:37:17 +0800
• 08d6763db6 feat: 添加count_n_b caoqianming 2024-11-28 09:27:15 +0800
• 87c6b0cf9e Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2024-11-28 09:12:22 +0800
• bf524286c1 feat: 添加不合格项目 炸头 caoqianming 2024-11-28 09:12:08 +0800
• c0f796f4a0 fix: em/service 修改tkx 设备model zty 2024-11-26 17:54:59 +0800
• 42d8dced09 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server zty 2024-11-25 18:14:17 +0800
• 9db524dfdb feat: em/filter apps 修改设备字段信息 zty 2024-11-25 18:14:12 +0800
• 1311217668 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2024-11-25 17:52:17 +0800
• f3d023432d feat: 支持合格b类 caoqianming 2024-11-25 17:52:04 +0800
• 1010a6b86f Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server zty 2024-11-25 17:45:10 +0800
• f0a748e304 feat:修改自动生成班组 zty 2024-11-25 17:45:08 +0800
• 53322ed9ad feat: 兄弟件产出需要注意batch的修改 caoqianming 2024-11-24 17:22:03 +0800
• 12d77e53b6 feat: mlog submit 添加一个注释 caoqianming 2024-11-24 17:03:39 +0800
• a484c0021d fix: wm_in 找不到的错误 caoqianming 2024-11-24 16:07:11 +0800
• d52bd4e064 feat: mlog 变化不再创建日志 caoqianming 2024-11-23 23:12:45 +0800
• 84f7de61bc fix: mlog update 没有消耗时的校验 caoqianming 2024-11-23 23:06:01 +0800
• cb36aac9ca feat: 去除handover send强校验 caoqianming 2024-11-23 22:32:55 +0800
• 89d9a987f4 fix: mtask_submit 不会触发utask_submit caoqianming 2024-11-23 22:24:38 +0800
• 580109aa9f fix: mlog 填写方式及handoverb的问题 caoqianming 2024-11-22 18:35:12 +0800
• 5d6ce9f6c0 feat: mlog_submit mlog_revert bug caoqianming 2024-11-22 09:07:03 +0800
• 2c569db0d8 fix: do_in wm_production_dept caoqianming 2024-11-21 17:23:35 +0800
• 8c63aea877 fix: validate data pop None caoqianming 2024-11-21 17:04:36 +0800
• 05af336180 fix: mlog create 时的bug caoqianming 2024-11-21 17:03:34 +0800
• 72b04ddc7a feat: 单工序多工段情况下平均分配 caoqianming 2024-11-21 15:20:27 +0800
• 32158dfa77 feat: WMaterialFilter mtaskx根据batch_bind进行校验 caoqianming 2024-11-21 13:34:15 +0800
• 1bfafdb0e4 feat: handover添加备注字段 caoqianming 2024-11-21 13:21:53 +0800
• 93cabf0ebc feat: mlogb增加查询条件以支持查询返工记录 caoqianming 2024-11-21 11:25:31 +0800
• 9014a7c869 feat: ftestwork添加设备和备注字段 caoqianming 2024-11-21 10:45:31 +0800
• 3dfcbd8a8b feat: speaker 接口忽略采集器5 caoqianming 2024-11-20 16:42:19 +0800
• 258d4975f8 feat: speaker 接口忽略采集器4 caoqianming 2024-11-20 16:38:44 +0800
• 5c2aac22e1 feat: speaker 接口忽略采集器3 caoqianming 2024-11-20 16:38:14 +0800
• 72604f9992 feat: speaker 接口忽略采集器2 caoqianming 2024-11-20 16:28:11 +0800
• ae15f1a33c feat: speaker 接口忽略采集器 caoqianming 2024-11-20 16:24:04 +0800
• 8667267046 feat: equipment 列表支持is_deleted查询 caoqianming 2024-11-20 13:18:42 +0800
• 16272cd15f feat: save_voice_and_speak 添加日志 caoqianming 2024-11-20 09:56:00 +0800
• 598cadc4bb feat: 添加事件喇叭播放测试api caoqianming 2024-11-20 09:49:42 +0800
• a11ce128be feat: 喇叭播放的日志 caoqianming 2024-11-20 09:45:53 +0800
• 5730a00742 feat: ftest更新ftestwork的count_sampling等字段 caoqianming 2024-11-19 17:52:57 +0800
• 1cb64b26af feat: mlog list 接口一点优化 caoqianming 2024-11-19 09:25:36 +0800
• 7c85d3df65 fix: mlog select_related_fields bug2 caoqianming 2024-11-18 17:38:11 +0800
• a0423cbd3f Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2024-11-18 17:28:03 +0800
• af72749b8a fix: mlog select_related_fields bug caoqianming 2024-11-18 17:27:41 +0800
• 13751b8a76 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server zty 2024-11-18 13:51:09 +0800
• 3fff294189 fix : enm 修改 单位产品综合能耗 zty 2024-11-18 13:51:04 +0800
• e67bd892ae Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2024-11-18 10:42:44 +0800
• 71db15bacd feat: 添加cms模块创建article表 caoqianming 2024-11-18 10:42:33 +0800
• c2cae12c4f fix:enm/service 修改小数点 zty 2024-11-18 09:34:27 +0800
• 9d5d7eceaf fix : tkx enm bug fix zty 2024-11-14 17:48:48 +0800
• 4518344fa6 fix: do_out 领料时的material_ofrom caoqianming 2024-11-14 13:04:40 +0800
• 6ef01ee301 fix: 其他出入库错误 caoqianming 2024-11-14 12:26:40 +0800
• 95739bc3bb feat: wmaterial增加查询条件 caoqianming 2024-11-14 12:12:14 +0800
• 6006d42f9d fix: do_in bug caoqianming 2024-11-14 11:54:55 +0800
• a00f533752 fix: mlog submit 关于wm.batch_ofrom的bug caoqianming 2024-11-14 11:39:17 +0800
• 9fb09f7c2a fix: mlog submit 关于count_n的bug caoqianming 2024-11-14 11:24:13 +0800
• fdb06c6883 fix: 非合格/返修品不可使用 报错 caoqianming 2024-11-14 11:17:11 +0800
• 384bef705c fix: MaterialBatch 添加字段以支持追踪原料批次6 caoqianming 2024-11-14 11:02:05 +0800
• e92ceca953 feat: MaterialBatch 添加字段以支持追踪原料批次5 caoqianming 2024-11-14 10:52:21 +0800
• b5928b2927 feat: MaterialBatch 添加字段以支持追踪原料批次4 caoqianming 2024-11-14 10:40:14 +0800
• b9d9cf42cb feat: mlog serializer添加batch_ofrom等 caoqianming 2024-11-14 08:47:31 +0800
• 90e699155c feat: MaterialBatch 添加字段以支持追踪原料批次3 caoqianming 2024-11-13 18:16:02 +0800
• 27c646e6df feat: MaterialBatch 添加字段以支持追踪原料批次2 caoqianming 2024-11-13 17:23:41 +0800
• 4016c421be feat: MaterialBatch 添加字段以支持追踪原料批次 caoqianming 2024-11-13 17:22:25 +0800
• 7d9582fe34 feat: mlogb添加字段以追踪原料批次 caoqianming 2024-11-13 15:56:40 +0800
• c1d140a082 feat: mpointstat filterset 支持hour,day,month,year caoqianming 2024-11-12 15:26:02 +0800
• 6698e38d32 feat: wmaterial增加字段 caoqianming 2024-11-12 14:51:53 +0800
• 0d66ae5e90 feat: generate_new_batch 中添加-变为> caoqianming 2024-11-12 14:13:06 +0800
• a6fadedee2 fix: handle_date使用localdate获取日期 caoqianming 2024-11-11 17:00:33 +0800
• 96ba8c8223 feat: base permission serializer修改继承 caoqianming 2024-11-11 10:53:11 +0800
• ec834e27df Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2024-11-07 17:51:04 +0800
• 764396f42c feat: base 支持树型的递归分页查询以传with_children参数 caoqianming 2024-11-07 17:50:48 +0800
• feae902704 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server zty 2024-11-07 16:50:15 +0800
• 9c8e0081e2 feat: 修改 last_val - first_val 值 zty 2024-11-07 16:50:11 +0800
• 6eec199488 feat: mlog create时校验mtask是否是下达状态 caoqianming 2024-11-07 09:40:32 +0800
• 79b1317cc6 feat: count_running_state返回更多信息2 caoqianming 2024-11-07 09:03:54 +0800
• 0ba6737661 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2024-11-07 09:02:08 +0800
• 8c8d7af1ba feat: count_running_state返回更多信息 caoqianming 2024-11-07 09:01:53 +0800
• aa75148878 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server zty 2024-11-06 10:43:50 +0800
• 8ec5f8c6dd feat: enm 回转窑综合电耗计算 zty 2024-11-06 10:43:45 +0800
• 98e3520127 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2024-11-05 17:43:50 +0800
• bce4a44408 feat: wmaterial可按mtask进行查询过滤 caoqianming 2024-11-05 17:43:34 +0800
• 5fe86c3e98 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server zty 2024-11-05 13:34:45 +0800
• 336f35ed28 feat:修改喇叭内容 zty 2024-11-05 13:34:42 +0800
• 8859cc01a6 feat: mtask增加route__sort排序 caoqianming 2024-10-31 15:51:01 +0800
• c403b9161a Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2024-10-29 14:50:31 +0800
• cdcfbf35ef feat: SPLIT_FIELD 改为 # caoqianming 2024-10-29 14:50:19 +0800
• a563566623 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server zty 2024-10-29 09:36:33 +0800
• 1ff55c6ee4 feat: apps/enm/view 修改offline状态 zty 2024-10-29 09:36:28 +0800
• 8e08d37b62 feat: base 更新全部权限时仅失效缓存即可 caoqianming 2024-10-23 17:07:52 +0800
• 8d6939a4fc feat: base 更新全部权限时仅失效缓存即可 caoqianming 2024-10-23 17:07:52 +0800