 caoqianming
|
5d6ce9f6c0
|
feat: mlog_submit mlog_revert bug
|
2024-11-22 09:07:03 +08:00 |
|
caoqianming
|
2c569db0d8
|
fix: do_in wm_production_dept
|
2024-11-21 17:23:35 +08:00 |
|
caoqianming
|
8c63aea877
|
fix: validate data pop None
|
2024-11-21 17:04:36 +08:00 |
|
caoqianming
|
05af336180
|
fix: mlog create 时的bug
|
2024-11-21 17:03:34 +08:00 |
|
caoqianming
|
72b04ddc7a
|
feat: 单工序多工段情况下平均分配
|
2024-11-21 15:20:27 +08:00 |
|
caoqianming
|
32158dfa77
|
feat: WMaterialFilter mtaskx根据batch_bind进行校验
|
2024-11-21 13:34:15 +08:00 |
|
caoqianming
|
1bfafdb0e4
|
feat: handover添加备注字段
|
2024-11-21 13:21:53 +08:00 |
|
caoqianming
|
93cabf0ebc
|
feat: mlogb增加查询条件以支持查询返工记录
|
2024-11-21 11:25:31 +08:00 |
|
caoqianming
|
9014a7c869
|
feat: ftestwork添加设备和备注字段
|
2024-11-21 10:45:31 +08:00 |
|
caoqianming
|
3dfcbd8a8b
|
feat: speaker 接口忽略采集器5
|
2024-11-20 16:42:19 +08:00 |
|
caoqianming
|
258d4975f8
|
feat: speaker 接口忽略采集器4
|
2024-11-20 16:38:44 +08:00 |
|
caoqianming
|
5c2aac22e1
|
feat: speaker 接口忽略采集器3
|
2024-11-20 16:38:14 +08:00 |
|
caoqianming
|
72604f9992
|
feat: speaker 接口忽略采集器2
|
2024-11-20 16:28:11 +08:00 |
|
caoqianming
|
ae15f1a33c
|
feat: speaker 接口忽略采集器
|
2024-11-20 16:24:04 +08:00 |
|
caoqianming
|
8667267046
|
feat: equipment 列表支持is_deleted查询
|
2024-11-20 13:18:42 +08:00 |
|
caoqianming
|
16272cd15f
|
feat: save_voice_and_speak 添加日志
|
2024-11-20 09:56:00 +08:00 |
|
caoqianming
|
598cadc4bb
|
feat: 添加事件喇叭播放测试api
|
2024-11-20 09:49:42 +08:00 |
|
caoqianming
|
a11ce128be
|
feat: 喇叭播放的日志
|
2024-11-20 09:45:53 +08:00 |
|
caoqianming
|
5730a00742
|
feat: ftest更新ftestwork的count_sampling等字段
|
2024-11-19 17:52:57 +08:00 |
|
caoqianming
|
1cb64b26af
|
feat: mlog list 接口一点优化
|
2024-11-19 09:25:36 +08:00 |
|
caoqianming
|
7c85d3df65
|
fix: mlog select_related_fields bug2
|
2024-11-18 17:38:11 +08:00 |
|
caoqianming
|
a0423cbd3f
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-11-18 17:28:03 +08:00 |
|
caoqianming
|
af72749b8a
|
fix: mlog select_related_fields bug
|
2024-11-18 17:27:41 +08:00 |
 zty
|
13751b8a76
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-11-18 13:51:09 +08:00 |
|
zty
|
3fff294189
|
fix : enm 修改 单位产品综合能耗
|
2024-11-18 13:51:04 +08:00 |
|
caoqianming
|
e67bd892ae
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-11-18 10:42:44 +08:00 |
|
caoqianming
|
71db15bacd
|
feat: 添加cms模块创建article表
|
2024-11-18 10:42:33 +08:00 |
|
zty
|
c2cae12c4f
|
fix:enm/service 修改小数点
|
2024-11-18 09:34:27 +08:00 |
|
zty
|
9d5d7eceaf
|
fix : tkx enm bug fix
|
2024-11-14 17:48:48 +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 |
|
caoqianming
|
7dd39d75bf
|
fix: 相关方分配管理员重置岗位
|
2024-10-17 10:28:39 +08:00 |
|
caoqianming
|
b28174309a
|
feat: 从车间库存明细获取物料标签
|
2024-10-16 11:13:25 +08:00 |
|
zty
|
46dd264dba
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-10-15 09:54:54 +08:00 |
|
zty
|
e6e18c6c30
|
feat: enm/task nick_name
|
2024-10-15 09:54:24 +08:00 |
|
caoqianming
|
3d7a9fb481
|
feat: labelmat 返回state_name
|
2024-10-14 13:20:36 +08:00 |
|
caoqianming
|
af751f5a9d
|
feat: 增加从车间库存明细获取物料标签
|
2024-10-14 09:09:25 +08:00 |
|
caoqianming
|
ebf3bbe257
|
feat: get_from_mb 返回更多信息
|
2024-10-11 15:54:19 +08:00 |
|
caoqianming
|
0157daa0ab
|
feat: 获取标签明细3
|
2024-10-11 15:41:55 +08:00 |
|
caoqianming
|
ef28e1ba47
|
feat: 获取标签明细2
|
2024-10-11 15:39:04 +08:00 |
|
caoqianming
|
52a7d41518
|
feat: 获取标签明细
|
2024-10-11 15:38:28 +08:00 |
|
caoqianming
|
419dbf3560
|
feat: 获取物料标签信息
|
2024-10-11 15:34:10 +08:00 |
|
caoqianming
|
107818301f
|
feat: 改变条码格式
|
2024-10-11 15:28:07 +08:00 |
|
caoqianming
|
c524d1b9a5
|
feat: 添加条码二维码管理的app
|
2024-10-11 15:26:48 +08:00 |
|
caoqianming
|
8e918e9a7e
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-10-11 13:36:56 +08:00 |
|
caoqianming
|
ed8ee4e68d
|
feat: materialbatch 添加supplier字段
|
2024-10-11 13:36:53 +08:00 |
|
zty
|
5203719023
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-10-10 13:34:16 +08:00 |
|
zty
|
96f4b0c445
|
feat: apps/enm 新增成本计算
|
2024-10-10 13:33:58 +08:00 |
|
caoqianming
|
c546e25808
|
fix: base get_alld_perms 传参
|
2024-10-09 14:18:11 +08:00 |
|
caoqianming
|
f347630981
|
feat: base 优化permission缓存处理
|
2024-10-09 13:57:35 +08:00 |
|
caoqianming
|
bc77137093
|
feat: base perm变动时出发get_alld_perms
|
2024-10-09 13:56:20 +08:00 |
|
caoqianming
|
552055e6c5
|
feat: base 启动时缓存perms_alld_list
|
2024-10-09 13:55:41 +08:00 |
|
caoqianming
|
5e38f96925
|
feat: base CustomGenericViewSet 初始化优化
|
2024-10-09 13:47:11 +08:00 |
|
caoqianming
|
71ac63bdaf
|
feat: base 添加全局线程池
|
2024-10-09 13:46:38 +08:00 |
|
zty
|
74ece85b0a
|
fix: import edge_tts 在函数中引入
|
2024-10-09 10:00:46 +08:00 |
|
zty
|
7f9e2ad616
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-10-09 09:29:12 +08:00 |
|
zty
|
66af6475d9
|
feat: 修改采集时候出现0的处理
|
2024-10-09 09:26:29 +08:00 |
|
caoqianming
|
7c71eafa41
|
feat: 添加edge-tts语音生成
|
2024-10-08 15:10:59 +08:00 |
|
caoqianming
|
494b078a09
|
feat: save_voice_and_speak 优化
|
2024-10-08 15:10:42 +08:00 |
|
caoqianming
|
40c6479cf3
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-10-08 12:58:19 +08:00 |
|
caoqianming
|
4f73aa2030
|
feat: 检查相关方人员门禁到期设为离职
|
2024-10-08 12:58:17 +08:00 |
|
zty
|
924d7f2b61
|
feat: 百度语音的配置
|
2024-09-30 17:05:43 +08:00 |
|
zty
|
780564f6e1
|
feat: 煤粉热值处理2
|
2024-09-30 16:22:30 +08:00 |
|
zty
|
cc5b521f5d
|
feat: 煤粉热值校正
|
2024-09-30 16:21:44 +08:00 |
|
zty
|
9c6e8f5992
|
fix: 电表水表0值处理
|
2024-09-30 16:21:18 +08:00 |
|
zty
|
956500d3aa
|
fix :enm/serializer round
|
2024-09-26 15:56:18 +08:00 |
|
zty
|
9a3e15f926
|
feat: 优化mgroup_run_change
|
2024-09-26 11:51:36 +08:00 |
|
zty
|
9f90d84244
|
fix: em/bug
|
2024-09-26 11:02:59 +08:00 |
|
zty
|
7517da3e92
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-09-25 16:04:03 +08:00 |
|
zty
|
008219e9ba
|
fix : em enm wpm 修改更新设备运行状态
|
2024-09-25 16:03:59 +08:00 |
|
caoqianming
|
c0cb51a5b5
|
feat: utask生产任务提交
|
2024-09-25 13:24:48 +08:00 |
|
caoqianming
|
73aa186293
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-09-24 10:24:53 +08:00 |
|
caoqianming
|
49712b8211
|
feat: mio添加mgroup查询条件
|
2024-09-24 10:24:51 +08:00 |
|
zty
|
dd3c0d6f6b
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-09-23 10:04:46 +08:00 |
|
zty
|
d5e48c1ab8
|
fix: enm、fim 修改费用过滤和能源加入班组开始结束时间
|
2024-09-23 10:04:43 +08:00 |
|
caoqianming
|
8273a96597
|
fix: FtestWork 检验数据设置为非负整数
|
2024-09-20 09:16:03 +08:00 |
|
caoqianming
|
5628a1ff83
|
feat: ftestwork增加校验
|
2024-09-19 15:08:54 +08:00 |
|
caoqianming
|
305fda44c2
|
feat: wmaterialserializer 增加count_cando返回
|
2024-09-18 09:34:55 +08:00 |
|
zty
|
6c6a6ce440
|
fix: mtm/service note
|
2024-09-13 15:21:26 +08:00 |
|
zty
|
0453499ee5
|
add: new migrations file
|
2024-09-13 15:08:42 +08:00 |
|
zty
|
7aae49b378
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-09-13 13:41:29 +08:00 |
|
zty
|
c4607e1608
|
fix /enm/service.py 停机时间短 无班组 加入异常原因
|
2024-09-13 13:40:45 +08:00 |
|
caoqianming
|
f51bb48428
|
feat: handover serializer 优化
|
2024-09-13 12:53:55 +08:00 |
|
caoqianming
|
bc6406f12b
|
fix: ana equip_last_mlog
|
2024-09-12 17:23:40 +08:00 |
|
caoqianming
|
2753c78997
|
feat: bi查询报错后打日志
|
2024-09-12 15:23:38 +08:00 |
|
caoqianming
|
28e5b83896
|
fix: wmaterial 返回count_working3
|
2024-09-12 11:31:08 +08:00 |
|
caoqianming
|
2d79796ccb
|
fix: wmaterial 返回count_working2
|
2024-09-12 11:29:43 +08:00 |
|
caoqianming
|
8f0e512654
|
fix: wmaterial 返回count_working
|
2024-09-12 11:26:39 +08:00 |
|
caoqianming
|
de42dfc75f
|
fix: wmaterial 返回count_working
|
2024-09-12 11:24:56 +08:00 |
|
caoqianming
|
7a8bee5e59
|
feat: wmaterial增加count_working proptey
|
2024-09-12 11:19:00 +08:00 |
|
caoqianming
|
bc92e90765
|
feat: ftestwork 增加shift字段
|
2024-09-11 16:39:09 +08:00 |
|
caoqianming
|
1caba24321
|
feat: ftestwork belong_dept默认test_user 所在部门
|
2024-09-11 16:20:34 +08:00 |
|
caoqianming
|
ca2103db8e
|
fix: handover增加dept查询条件
|
2024-09-10 17:38:35 +08:00 |
|
caoqianming
|
082619070e
|
feat: handover增加dept查询条件
|
2024-09-10 17:06:56 +08:00 |
|
caoqianming
|
18fe346661
|
fix: tran_time_to_mstate
|
2024-09-10 15:12:14 +08:00 |
|
caoqianming
|
f3c31a5b39
|
feat: 投产分析接口
|
2024-09-10 08:50:30 +08:00 |
|
caoqianming
|
1490a35a32
|
feat: 投产分析
|
2024-09-09 16:44:25 +08:00 |
|
caoqianming
|
9a26529e0a
|
feat: 完善equip_last_mlog5
|
2024-09-09 15:03:38 +08:00 |
|
caoqianming
|
1b6e947492
|
feat: 完善equip_last_mlog4
|
2024-09-09 14:01:57 +08:00 |
|
caoqianming
|
4d5195308f
|
feat: 完善equip_last_mlog3
|
2024-09-09 13:52:51 +08:00 |
|
caoqianming
|
9ffe025ef7
|
feat: 完善equip_last_mlog2
|
2024-09-09 13:49:35 +08:00 |
|
caoqianming
|
768f7a9a22
|
feat: 完善equip_last_mlog
|
2024-09-09 13:33:48 +08:00 |
|
caoqianming
|
d940c82e34
|
fix: tran_time_to_mstate
|
2024-09-09 13:21:42 +08:00 |