Commit Graph

3122 Commits

Author SHA1 Message Date
caoqianming edac22b701 feat: cal_material_count 改为同步执行 2025-02-18 10:51:31 +08:00
caoqianming b3d060b25a feat: cal_material_count_from_mlog 2025-02-18 10:42:59 +08:00
caoqianming 7b87e79bf5 feat: 部分app model注释 2025-02-18 09:02:28 +08:00
caoqianming 855ca9b054 feat: wpm和wpmw表添加doc2 2025-02-17 16:57:50 +08:00
caoqianming 12c6cc0d17 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2025-02-17 16:17:09 +08:00
caoqianming 89642fb194 feat: wpm和wpmw表添加doc 2025-02-17 16:17:06 +08:00
zty 7544efdc1e Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2025-02-17 15:35:24 +08:00
zty 095a6f9d51 feat: enm/task view 修改校正测试 增加能修改 天和月的时间类型 2025-02-17 15:35:21 +08:00
caoqianming 9f558acedb feat: base execute_raw_sql时允许不返回值 2025-02-17 14:37:30 +08:00
caoqianming 57e6e23e95 feat: equip添加采集数据请求字段 2025-02-17 14:35:43 +08:00
caoqianming 8cbb921969 feat: 光子棒管综合统计添加数据 2025-02-17 11:24:43 +08:00
caoqianming e6b27950b2 feat: ftestitem增加检测设备字段 2025-02-17 09:34:48 +08:00
caoqianming 61525d236e feat: qct detail是检测项按顺序返回 2025-02-14 10:56:40 +08:00
caoqianming d7361a71df perf: 优化has_envdata的sql查询2 2025-02-13 13:26:32 +08:00
caoqianming 61f9dc3b51 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2025-02-13 11:26:30 +08:00
caoqianming dbbdaa89b9 perf: 优化has_envdata的sql查询 2025-02-13 11:26:27 +08:00
zty 5ecb3341e0 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2025-02-12 17:34:09 +08:00
zty 5f85d0273c feat: 修改enm/task 2025-02-12 17:34:04 +08:00
caoqianming 9d27ccd1dc fix: base get_user_route 路由重复的问题 2025-02-12 15:10:20 +08:00
caoqianming 861bb03469 feat: wpmw添加字段 2025-02-12 15:10:00 +08:00
caoqianming a88f7e282e feat: Ptest不指定testitem 2025-02-11 14:53:26 +08:00
caoqianming 7dc11e032d Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2025-02-11 14:40:41 +08:00
caoqianming ac41f5a105 fix: 粗中细磨的统计要涵盖粗磨和粗中磨的数据 2025-02-11 14:40:38 +08:00
zty f7d6f59fcd feat: 修改 enm 回转窑产量计算 2025-02-11 14:24:59 +08:00
caoqianming 44486b64a3 feat: mlogbw的输出不允许删除 2025-02-11 11:12:14 +08:00
caoqianming edfc63a2e2 feat: base 修改系统名称 2025-02-10 18:19:20 +08:00
caoqianming f8416d91b6 feat: 增加mio返回is_tested 2025-02-10 18:19:06 +08:00
caoqianming b8c0a9b420 fix: 车间执行人和仓库人问题 2025-02-10 15:57:40 +08:00
caoqianming 1a3e428195 feat: do_in 支持wpr 2025-02-08 15:31:35 +08:00
caoqianming 33f162fa3a fix: do_in 的bug 2025-02-08 14:49:30 +08:00
caoqianming 8838227919 feat: wpr增加查询条件 2025-02-08 14:26:21 +08:00
caoqianming 957938f8dd feat: mpoint添加search字段 2025-02-08 11:09:58 +08:00
caoqianming ff4bdf027f fix: equip_last_mlog 添加运行状态 2025-02-08 10:53:23 +08:00
caoqianming 5b7b1bf276 fix: 获取可交接到的工段进行去重 2025-02-08 09:45:05 +08:00
caoqianming 2843905def feat: 默认密码从conf中读取 2025-02-08 09:41:49 +08:00
caoqianming 550a3281bc fix: 获取可交接到的工段2 2025-02-07 13:34:25 +08:00
caoqianming 2488e500ce fix: 获取可交接到的工段 2025-02-07 10:12:27 +08:00
caoqianming b96846d2c0 feat: 获取可交接到的工段 2025-02-07 10:04:12 +08:00
caoqianming 622d594795 feat: 优化mloginit报错提示 2025-02-06 16:56:06 +08:00
caoqianming 77a50ae162 feat: route添加material筛选条件 2025-02-06 16:40:42 +08:00
caoqianming 1b2f201786 feat: 入厂和作业时进行证书过期校验 2025-02-06 09:21:20 +08:00
caoqianming 171348fbbd feat: base 短信发送读取配置 2025-02-05 17:24:08 +08:00
caoqianming b1a574051c feat: examrecord添加查询条件 2025-02-05 17:19:58 +08:00
caoqianming 6cd55f8460 feat: certificate添加state字段及其处理 2025-02-05 14:41:32 +08:00
caoqianming 821b88eb90 feat: handover submit支持改版 2025-02-05 10:55:21 +08:00
caoqianming 66e4273b97 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2025-02-05 09:54:31 +08:00
caoqianming 8a2e409c8a feat: 增加改版交接类型 2025-02-05 09:54:22 +08:00
zty abf50b97b8 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2025-02-05 09:20:49 +08:00
zty 2f46f9e31a feat: 修改qm 增加rate_pass 目标值 2025-02-05 09:20:47 +08:00
caoqianming 7740613cf7 feat: testitem删除校验 2025-01-24 16:19:59 +08:00