Commit Graph

2434 Commits

Author SHA1 Message Date
caoqianming 71db15bacd feat: 添加cms模块创建article表 2024-11-18 10:42:33 +08:00
caoqianming 4518344fa6 fix: do_out 领料时的material_ofrom 2024-11-14 13:04:40 +08:00
caoqianming 6ef01ee301 fix: 其他出入库错误 2024-11-14 12:26:40 +08:00
caoqianming 95739bc3bb feat: wmaterial增加查询条件 2024-11-14 12:12:14 +08:00
caoqianming 6006d42f9d fix: do_in bug 2024-11-14 11:54:55 +08:00
caoqianming a00f533752 fix: mlog submit 关于wm.batch_ofrom的bug 2024-11-14 11:39:17 +08:00
caoqianming 9fb09f7c2a fix: mlog submit 关于count_n的bug 2024-11-14 11:24:13 +08:00
caoqianming fdb06c6883 fix: 非合格/返修品不可使用 报错 2024-11-14 11:17:11 +08:00
caoqianming 384bef705c fix: MaterialBatch 添加字段以支持追踪原料批次6 2024-11-14 11:02:05 +08:00
caoqianming e92ceca953 feat: MaterialBatch 添加字段以支持追踪原料批次5 2024-11-14 10:52:21 +08:00
caoqianming b5928b2927 feat: MaterialBatch 添加字段以支持追踪原料批次4 2024-11-14 10:40:14 +08:00
caoqianming b9d9cf42cb feat: mlog serializer添加batch_ofrom等 2024-11-14 08:47:31 +08:00
caoqianming 90e699155c feat: MaterialBatch 添加字段以支持追踪原料批次3 2024-11-13 18:16:02 +08:00
caoqianming 27c646e6df feat: MaterialBatch 添加字段以支持追踪原料批次2 2024-11-13 17:23:41 +08:00
caoqianming 4016c421be feat: MaterialBatch 添加字段以支持追踪原料批次 2024-11-13 17:22:25 +08:00
caoqianming 7d9582fe34 feat: mlogb添加字段以追踪原料批次 2024-11-13 15:56:40 +08:00
caoqianming c1d140a082 feat: mpointstat filterset 支持hour,day,month,year 2024-11-12 15:26:02 +08:00
caoqianming 6698e38d32 feat: wmaterial增加字段 2024-11-12 14:51:53 +08:00
caoqianming 0d66ae5e90 feat: generate_new_batch 中添加-变为> 2024-11-12 14:13:06 +08:00
caoqianming a6fadedee2 fix: handle_date使用localdate获取日期 2024-11-11 17:00:33 +08:00
caoqianming 96ba8c8223 feat: base permission serializer修改继承 2024-11-11 10:53:11 +08:00
caoqianming ec834e27df Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-11-07 17:51:04 +08:00
caoqianming 764396f42c feat: base 支持树型的递归分页查询以传with_children参数 2024-11-07 17:50:48 +08:00
zty feae902704 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-11-07 16:50:15 +08:00
zty 9c8e0081e2 feat: 修改 last_val - first_val 值 2024-11-07 16:50:11 +08:00
caoqianming 6eec199488 feat: mlog create时校验mtask是否是下达状态 2024-11-07 09:40:32 +08:00
caoqianming 79b1317cc6 feat: count_running_state返回更多信息2 2024-11-07 09:03:54 +08:00
caoqianming 0ba6737661 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-11-07 09:02:08 +08:00
caoqianming 8c8d7af1ba feat: count_running_state返回更多信息 2024-11-07 09:01:53 +08:00
zty aa75148878 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-11-06 10:43:50 +08:00
zty 8ec5f8c6dd feat: enm 回转窑综合电耗计算 2024-11-06 10:43:45 +08:00
caoqianming 98e3520127 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-11-05 17:43:50 +08:00
caoqianming bce4a44408 feat: wmaterial可按mtask进行查询过滤 2024-11-05 17:43:34 +08:00
zty 5fe86c3e98 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-11-05 13:34:45 +08:00
zty 336f35ed28 feat:修改喇叭内容 2024-11-05 13:34:42 +08:00
caoqianming 8859cc01a6 feat: mtask增加route__sort排序 2024-10-31 15:51:01 +08:00
caoqianming c403b9161a Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-10-29 14:50:31 +08:00
caoqianming cdcfbf35ef feat: SPLIT_FIELD 改为 # 2024-10-29 14:50:19 +08:00
zty a563566623 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-10-29 09:36:33 +08:00
zty 1ff55c6ee4 feat: apps/enm/view 修改offline状态 2024-10-29 09:36:28 +08:00
caoqianming 8d6939a4fc feat: base 更新全部权限时仅失效缓存即可 2024-10-23 17:07:52 +08:00
caoqianming d4dc94df89 feat: edu paper添加type字段 2024-10-23 16:30:28 +08:00
caoqianming 3343d30f77 feat: develop添加测试任务 2024-10-22 08:28:04 +08:00
caoqianming 7b34ddd70c fix: 系统初始化时不必获取全部权限标识 2024-10-20 11:02:07 +08:00
caoqianming f02008f6de Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-10-20 10:46:08 +08:00
caoqianming ca32d9f20f fix: base permission获取优化 2024-10-20 10:46:06 +08:00
caoqianming abeb70d166 feat: develop添加一个测试任务 2024-10-18 09:43:06 +08:00
caoqianming f85db52ec7 fix: get_from_mioitem bug 2024-10-17 15:55:26 +08:00
caoqianming 27f7b3c076 feat: check_remployee_leave触发账户禁用 2024-10-17 13:39:45 +08:00
caoqianming deb0cb48df fix: check_remployee_leave转task 2024-10-17 11:12:29 +08:00