Commit Graph

2551 Commits

Author SHA1 Message Date
zty c0f796f4a0 fix: em/service 修改tkx 设备model 2024-11-26 17:54:59 +08:00
zty 42d8dced09 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-11-25 18:14:17 +08:00
zty 9db524dfdb feat: em/filter apps 修改设备字段信息 2024-11-25 18:14:12 +08:00
caoqianming 1311217668 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-11-25 17:52:17 +08:00
caoqianming f3d023432d feat: 支持合格b类 2024-11-25 17:52:04 +08:00
zty 1010a6b86f Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-11-25 17:45:10 +08:00
zty f0a748e304 feat:修改自动生成班组 2024-11-25 17:45:08 +08:00
caoqianming 53322ed9ad feat: 兄弟件产出需要注意batch的修改 2024-11-24 17:22:03 +08:00
caoqianming 12d77e53b6 feat: mlog submit 添加一个注释 2024-11-24 17:03:39 +08:00
caoqianming a484c0021d fix: wm_in 找不到的错误 2024-11-24 16:07:11 +08:00
caoqianming d52bd4e064 feat: mlog 变化不再创建日志 2024-11-23 23:12:45 +08:00
caoqianming 84f7de61bc fix: mlog update 没有消耗时的校验 2024-11-23 23:06:01 +08:00
caoqianming cb36aac9ca feat: 去除handover send强校验 2024-11-23 22:32:55 +08:00
caoqianming 89d9a987f4 fix: mtask_submit 不会触发utask_submit 2024-11-23 22:24:38 +08:00
caoqianming 580109aa9f fix: mlog 填写方式及handoverb的问题 2024-11-22 18:35:12 +08:00
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