Commit Graph

2445 Commits

Author SHA1 Message Date
caoqianming e6e80f5d52 feat: base 增加code分析工具类 2024-08-27 17:26:29 +08:00
caoqianming 8828625346 feat: base dbconnection支持pg 2024-08-27 17:26:05 +08:00
caoqianming 1b19c02754 feat: base ptaskresult 更多filter 2024-08-27 17:25:46 +08:00
caoqianming b57fd16d5a fix: base basemodel handle_parent 处理bug 2024-08-26 15:28:13 +08:00
caoqianming ac6fd28aba feat: 增加棕圈作为不合格项 2024-08-26 14:25:26 +08:00
caoqianming cdd879c583 feat: 添加不合格品小崩边 2024-08-26 14:15:01 +08:00
caoqianming d83b5ec0d2 feat: myschedule createserializer 优化2 2024-08-26 13:49:27 +08:00
caoqianming 4739124cc8 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-08-26 13:28:40 +08:00
caoqianming ba00580fec feat: myschedule createserializer 优化 2024-08-26 13:27:09 +08:00
zty c5e180944d Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-08-23 17:21:16 +08:00
zty 28834f88cd fix : 煤磨 2024-08-23 17:20:57 +08:00
caoqianming 6205ba682c feat: gascheck增加字段 2024-08-22 15:08:45 +08:00
caoqianming 26172b767f feat: utask mtask 增加筛选条件 2024-08-22 12:45:53 +08:00
zty 4960ee7fac feat: 增加水泥包装 2024-08-21 17:55:23 +08:00
caoqianming 33a7e7320b fix: daoru_material 增加校验 2024-08-21 14:12:52 +08:00
caoqianming a48ee63679 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-08-21 09:27:40 +08:00
caoqianming 4a277eb954 feat: base 可使用跳板机转发错误邮件 2024-08-21 09:27:37 +08:00
zty 5a35ea6028 feat: 增加出厂水泥 和 计算 2024-08-21 08:59:24 +08:00
zty bc38196f68 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-08-20 14:43:55 +08:00
zty 206e33d091 fix :apps\enm filter 2024-08-20 14:43:53 +08:00
caoqianming 1e667e69ac feat: daoru_material 增加校验 2024-08-20 14:39:38 +08:00
caoqianming 561c2a0c31 feat: materialbatch也不进行物理删除 2024-08-20 14:25:01 +08:00
caoqianming 592e34c07e refector: mgroup_on_change时创建stlog优化 2024-08-20 08:56:08 +08:00
caoqianming d102f01c26 feat: 增加check_opl_work_imgs 2024-08-19 16:51:46 +08:00
caoqianming e2d652f9ef fix: get_area_from_point 获取cache bug 2024-08-19 16:17:33 +08:00
caoqianming 28958b405c fix: check_opl_audit_imgs bug 2024-08-19 13:41:47 +08:00
caoqianming 9ce56d3f34 feat: ftestwork增加关联仓库库存字段 2024-08-19 11:35:36 +08:00
caoqianming c00f59f8d9 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-08-19 08:59:26 +08:00
caoqianming 808a1c825d feat: check_opl_audit_imgs raise 2024-08-19 08:59:24 +08:00
zty c3b62f1831 fix: equip_elec_data 计算 2024-08-16 18:45:31 +08:00
zty 62fb5aa54c feat: sflog teamchange cal_quastat_sflog 2024-08-16 18:45:11 +08:00
zty 7a780ebd0d fix: set coefficient 2024-08-16 18:44:50 +08:00
zty cbce4998d9 feat: mpoint stat添加筛选条件 2024-08-16 18:44:30 +08:00
zty a09343322e Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-08-16 18:44:02 +08:00
zty 4cdc48e549 fix: equip_elec_data 计算 2024-08-16 18:44:00 +08:00
caoqianming c8db1ad29b feat: base handle_parent报错调整 2024-08-15 15:53:42 +08:00
caoqianming 0aa0b051e9 fix: em ecate serializer 优化 2024-08-15 15:53:17 +08:00
caoqianming c71624def0 fix: em serializer 优化 2024-08-15 11:36:38 +08:00
caoqianming 3976e3834e Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-08-15 11:17:51 +08:00
caoqianming cb46d9bfc6 fix: ecate code 必填校验 2024-08-15 11:17:48 +08:00
zty 71dd916dbf Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-08-15 10:47:47 +08:00
zty 13fb91e83a fix:enm/service 修改稿last_val 2024-08-15 10:47:43 +08:00
caoqianming 7028fd31ee feat: wmaterial增加state字段并进行相应处理2 2024-08-15 10:43:45 +08:00
caoqianming ba6c30a745 feat: wmaterial增加state字段并进行相应处理 2024-08-15 10:41:36 +08:00
caoqianming 824dacf78d Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-08-15 09:47:06 +08:00
caoqianming bcafe94e71 fix: base validate_password支持.号 2024-08-15 09:47:04 +08:00
zty f52b501aa1 feat : enm/service 增加测点采集系数 2024-08-15 09:19:19 +08:00
zty 29ba9647b4 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-08-14 18:33:05 +08:00
zty 6a20445ddd fix : em/service 修改update_time 2024-08-14 18:33:01 +08:00
caoqianming 42769e3abe fix: mioitempurin bug 2024-08-14 18:17:31 +08:00