Commit Graph

2689 Commits

Author SHA1 Message Date
zty cc8d9b1bf4 feat: enm/service 修改 service 2024-12-27 14:42:10 +08:00
caoqianming 7f4acd2370 fix: objects.get_or_create 变更为safe_get_or_create用于解决并发冲突 2024-12-27 09:17:30 +08:00
caoqianming 7a6dc733f7 fix: cal_quastat_sflog 用sflog.work_date进行抽取年月日 2024-12-26 13:12:14 +08:00
caoqianming 1e4e80879f feat: 添加计算系数后的enm task修改 2024-12-25 15:24:26 +08:00
caoqianming 4b5308b0cc feat: 增加cal_coefficient_method 字段 2024-12-25 15:09:03 +08:00
caoqianming aae5c909c5 feat: enm mpoint 添加计算系数字段 2024-12-25 14:06:57 +08:00
zty 5a41aee253 feat: 生产qm 迁移文件 2024-12-25 10:17:05 +08:00
shijing 0c340bebcd fix:defect添加note 2024-12-25 10:13:44 +08:00
caoqianming 039cb3108b fix: mpointstat safe_get_or_create 2024-12-24 22:08:43 +08:00
caoqianming 43509aa25a feat: mpointstat safe_get_or_create 2024-12-24 21:59:41 +08:00
caoqianming a8f9583f7f feat: 增加safe_get_or_create方法 2024-12-24 21:58:53 +08:00
caoqianming 71ab520f3e fix: enstat_cen_consume_unit change bug 2024-12-24 18:35:04 +08:00
caoqianming 4a642b9014 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-12-24 18:20:52 +08:00
caoqianming f90bcd530b feat: 变更enstat排序 2024-12-24 18:20:40 +08:00
zty 13c4fb6663 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-12-24 18:09:03 +08:00
zty bcaa69ab30 feat:task 修改 更新 bill_date 2024-12-24 18:09:01 +08:00
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