Commit Graph

2673 Commits

Author SHA1 Message Date
caoqianming 841ece1d4f feat: 工段计算公式校正 2024-12-24 17:54:46 +08:00
zty f5fd9558ba feat: 修改 task bill_date 2024-12-24 15:49:20 +08:00
zty aa3ba099be Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-12-24 09:26:59 +08:00
zty 978d8f3577 feat: 增加定时任务 每天更新bill_date(出厂水泥采集) 2024-12-24 09:26:57 +08:00
caoqianming 27e3dfa3b3 feat: db_ins_mplogx bill_date bug 2024-12-23 18:31:02 +08:00
caoqianming cbcba52ff4 fix: QctTestItemSerializer 细化返回信息 2024-12-23 15:55:53 +08:00
caoqianming 91dacba668 fix: QctDetailSerializer bug 2024-12-23 15:29:10 +08:00
caoqianming 4eb8aeca96 feat: qct增加筛选条件 2024-12-23 10:52:14 +08:00
caoqianming f4c84f0354 feat: testitem add_info_for_list 2024-12-20 17:49:40 +08:00
caoqianming 4ab711cc71 feat: formula 调整到testitem 2024-12-20 15:46:32 +08:00
caoqianming 7fa065ce88 feat: QctTestItem 增加字段 2024-12-20 14:42:03 +08:00
caoqianming b289c7813e feat: qct 重构 2024-12-19 15:10:12 +08:00
caoqianming 796cdbc615 feat: base listmixin描述去除 2024-12-19 11:07:08 +08:00
caoqianming 1647b2f06e fix: 增加检测模板功能字段 bug 2024-12-19 11:04:16 +08:00
caoqianming e7c08dc16c fix: 增加检测模板功能QctItemSerializer bug 2024-12-19 10:12:24 +08:00
caoqianming 468f5ffdbf feat: 增加检测模板功能 2024-12-19 10:11:27 +08:00
caoqianming c58be8cdc3 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-12-18 14:53:33 +08:00
caoqianming ddb517d1f8 feat: material增加tracking字段 2024-12-18 14:53:21 +08:00
zty c08dff56bf Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-12-18 14:16:14 +08:00
zty 0df2506f26 feat: 修改 enm/qua_data 排序问题 2024-12-18 14:16:11 +08:00
caoqianming e62f7e5a9c feat: cal_real_task_count 纳入div_number 2024-12-18 11:08:42 +08:00
caoqianming 92145451e3 feat: route增加div_number字段3 2024-12-18 09:08:25 +08:00
caoqianming 2a5926f95b feat: route增加div_number字段2 2024-12-18 09:06:55 +08:00
caoqianming f653c2c191 feat: route增加div_number字段 2024-12-18 09:06:11 +08:00
caoqianming 7937a632a0 feat: process增加mtype 2024-12-17 17:20:54 +08:00
caoqianming 7d2d74ee80 feat: 日志操作时对有ticket的进行处理 2024-12-17 13:37:22 +08:00
caoqianming c3338d05c2 feat:ftestwork_audit_end时get_alldata_with_batch_and_store 2024-12-17 13:31:53 +08:00
caoqianming 7ad5bad137 feat: defect create update时进行限制 2024-12-17 13:28:29 +08:00
caoqianming 9a14216b78 feat: qm增加defect 2024-12-17 09:42:11 +08:00
caoqianming 8928c0b7aa feat: base get_user_route 排除route_name为空的 2024-12-16 17:02:54 +08:00
caoqianming c0136400d6 feat: get_user_route 排除path为空的 2024-12-16 16:51:53 +08:00
caoqianming bdd644a527 fix: 日志撤销的同时将任务变更状态 2024-12-16 13:06:02 +08:00
caoqianming 7e578b52c2 feat: 调整permission以支持后端路由2 2024-12-16 08:50:48 +08:00
caoqianming 28d89176e6 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-12-13 18:09:45 +08:00
caoqianming 5572b4cb0f feat: enstat update权限 2024-12-13 18:09:29 +08:00
zty c1e958f2f9 feat: enstate note makemigration 2024-12-13 17:46:28 +08:00
zty d364a0ae1e fix: enstatupdateserializer 2024-12-13 17:41:50 +08:00
zty 15950dacf9 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-12-13 17:32:59 +08:00
zty cdc70177bb fix: sflog work_date 默认start_time.date 2024-12-13 17:32:56 +08:00
caoqianming 005b5c1057 feat: 增加enstat note字段 2024-12-13 17:05:02 +08:00
zty e331002538 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-12-13 15:29:13 +08:00
zty 62a177b773 feat:登入 记录IP 和 增加每日的能源统计定时任务 2024-12-13 15:29:10 +08:00
caoqianming da54222e20 feat: 调整permission以支持后端路由 2024-12-13 13:01:10 +08:00
caoqianming a2f676e58c feat: 增加userfullinfoserializer 2024-12-13 12:59:20 +08:00
caoqianming 1a296e8e30 feat: process添加工序类型 2024-12-12 15:17:26 +08:00
caoqianming 765bcc39de feat: ftestwork添加ticket审批并编写绑定函数 2024-12-12 14:42:50 +08:00
caoqianming a432dca39b feat: mgroup添加查询条件 2024-12-12 11:18:07 +08:00
caoqianming 80fd2090ad feat: 工段添加code标识 2024-12-12 11:10:01 +08:00
caoqianming 0f920bae99 feat: 信号更新设备状态冲突时优先处理监测设备 2024-12-12 09:28:08 +08:00
caoqianming 6ecf61706a feat: 优化cal_exp_duration_sec 2024-12-11 18:16:03 +08:00