Commit Graph

Select branches

Hide Pull Requests

base

dev_cqm

dev_sj

master

#2

#3

#4

#5

#6

#7

2.6.2025031919

2.6.2025033109

2.6.2025040115

2.6.2025040211

2.6.2025040316

2.6.2025040710

2.6.2025040813

2.6.2025040913

2.6.2025041113

2.6.2025041613

2.6.2025042311

2.6.2025042816

2.6.2025043014

2.6.2025050816

2.6.2025051208

2.6.2025051609

2.6.2025051913

2.6.2025052615

2.6.2025060409

2.6.2025060617

2.6.2025060913

2.6.2025061715

2.6.2025062015

2.7.2025062414

2.7.2025070310

2.7.2025071516

2.7.2025073110

2.7.2025080409

2.7.2025080716

2.7.2025081813

2.7.2025082616

2.7.2025082816

2.8.2025090815

2.8.2025091616

2.8.2025092816

2.8.2025101011

3.0.2025110710

3.0.2025122514

3.0.2026010716

3.1.2026031316

3.1.2026033008

3.1.2026042912

Mono Color

• 26c7652095 feat: handoverbw的处理 caoqianming 2025-01-06 11:02:08 +0800
• fc56ecea08 fix: mlogbin创建mlogbw的错误2 caoqianming 2025-01-06 10:40:33 +0800
• 84723967dc fix: mlogbin创建mlogbw的错误 caoqianming 2025-01-06 10:33:33 +0800
• d784ac8a3c feat: 生产日志追踪到个完善 caoqianming 2025-01-06 10:23:51 +0800
• f8b056cadb feat: mioitemw为1个时自动创建2 caoqianming 2025-01-03 17:50:05 +0800
• 53f3f25030 feat: mioitemw为1个时自动创建 caoqianming 2025-01-03 17:46:18 +0800
• 38978c9dea feat: mioitem增加wm和mb字段 caoqianming 2025-01-03 17:33:08 +0800
• 437501b668 feat: mioitemw等增加wpr字段 caoqianming 2025-01-03 16:53:42 +0800
• 84525c03c8 feat: wpr增加返回信息及筛选条件 caoqianming 2025-01-03 15:39:13 +0800
• a151baaedd feat: 增加清洗数据的接口 caoqianming 2025-01-03 15:21:16 +0800
• 2790bddefa feat: wpr注册到路由 caoqianming 2025-01-03 15:20:29 +0800
• 86007d0ad4 fix: MIOItemwSerializer修改 caoqianming 2025-01-03 15:19:44 +0800
• 8d0d5ebcd0 fix: 主要是wpmw change_or_new的修正 caoqianming 2025-01-03 14:37:57 +0800
• 726946979c Merge remote-tracking branch 'origin/master' caoqianming 2025-01-02 17:16:16 +0800
• cd6e78961b fix: def cal_mlogb_count bug caoqianming 2025-01-02 17:14:56 +0800
• f2e5ce1d8d feat: enm 修改测点缓存 已存在 zty 2025-01-02 16:33:27 +0800
• 70e344ed68 feat: mlogrever支持单件回退 caoqianming 2025-01-02 16:29:09 +0800
• 426be9d805 feat: 添加mlogbw接口 caoqianming 2025-01-02 15:36:55 +0800
• 0a2f671f0f feat: materialsimpleserializer增加返回字段 caoqianming 2025-01-02 14:50:47 +0800
• ba41228d69 fix: 生产提交支持单个物料 caoqianming 2025-01-02 14:01:09 +0800
• 2c107d4050 fix: 生产领料支持单个 caoqianming 2025-01-02 11:32:11 +0800
• 82070c2bf1 feat: 生产领料支持单个 caoqianming 2025-01-02 11:28:16 +0800
• 09716d07fd fix: 修改wpdefect为wprdefect caoqianming 2025-01-02 10:49:49 +0800
• 64fc04d368 fix: 先注释mioitemw caoqianming 2025-01-02 10:44:53 +0800
• 37a6f37af5 feat: wproducts统一用wprs caoqianming 2025-01-02 10:41:42 +0800
• def67ebac5 fix: base 添加wpmw并支持出入库提交 caoqianming 2025-01-02 10:32:36 +0800
• 73b1d58b8a fix: base 添加wpmw app以追踪到个 caoqianming 2025-01-02 09:37:37 +0800
• 796d6e248f fix: base materialbatch添加字段 caoqianming 2025-01-02 09:35:18 +0800
• 89cbab8258 fix: base CustomRetrieveModelMixin支持添加add_info caoqianming 2024-12-31 15:31:54 +0800
• 83d8889b5e fix: base safe_get_or_create使用分布式锁 caoqianming 2024-12-31 15:28:28 +0800
• d3a35fac31 feat: mioitemwtest 接口 caoqianming 2024-12-31 10:53:46 +0800
• 1072621301 fix: 优化safe_get_or_create以处理并发4 caoqianming 2024-12-31 09:18:01 +0800
• f6fe704f65 feat: MIOItemCreateSerializer wproducts设置为非必填 caoqianming 2024-12-31 08:57:13 +0800
• b50cbcbc92 fix: 添加mioitemw caoqianming 2024-12-31 08:50:23 +0800
• 7621be49b6 feat: 添加mioitemw caoqianming 2024-12-31 08:45:52 +0800
• afe710e248 fix: 优化safe_get_or_create以处理并发3 caoqianming 2024-12-30 17:48:21 +0800
• 20d648957a feat: 重跑计算时添加日志 caoqianming 2024-12-30 15:15:42 +0800
• b6cfaf45ae fix: 优化safe_get_or_create以处理并发2 caoqianming 2024-12-30 14:28:38 +0800
• ac7c3cd29c feat: mpoint增加筛选条件 caoqianming 2024-12-30 14:23:02 +0800
• 564d8e1796 feat: base 优化safe_get_or_create以处理并发 caoqianming 2024-12-30 10:24:12 +0800
• 2d42a485af feat: 通过给定时间获取班年月日 caoqianming 2024-12-30 10:01:10 +0800
• 2197480831 feat: 优化safe_get_or_create以处理并发 caoqianming 2024-12-29 11:31:22 +0800
• 1fd76611b6 fix: make_sflogs if start_time的bug caoqianming 2024-12-29 00:34:32 +0800
• 9c2e940994 fix: get_mgroup_goals 可复用去年数据3 caoqianming 2024-12-29 00:01:34 +0800
• 9b44d2c398 fix: get_mgroup_goals 可复用去年的数据2 caoqianming 2024-12-28 23:32:14 +0800
• a310185c9d feat: get_mgroup_goals 可复用去年的数据 caoqianming 2024-12-28 23:22:50 +0800
• 28c7cf5375 feat: 增加goal返回code caoqianming 2024-12-28 12:30:59 +0800
• cd2f6eb77a feat: 原料磨用code处理 caoqianming 2024-12-27 17:16:48 +0800
• afc910a805 fix: make_sflogs bug caoqianming 2024-12-27 15:29:57 +0800
• cc8d9b1bf4 feat: enm/service 修改 service zty 2024-12-27 14:42:10 +0800
• 7f4acd2370 fix: objects.get_or_create 变更为safe_get_or_create用于解决并发冲突 caoqianming 2024-12-27 09:17:30 +0800
• 7a6dc733f7 fix: cal_quastat_sflog 用sflog.work_date进行抽取年月日 caoqianming 2024-12-26 13:12:14 +0800
• 1e4e80879f feat: 添加计算系数后的enm task修改 caoqianming 2024-12-25 15:24:26 +0800
• 4b5308b0cc feat: 增加cal_coefficient_method 字段 caoqianming 2024-12-25 15:09:03 +0800
• aae5c909c5 feat: enm mpoint 添加计算系数字段 caoqianming 2024-12-25 14:06:57 +0800
• 5a41aee253 feat: 生产qm 迁移文件 zty 2024-12-25 10:17:05 +0800
• 0c340bebcd fix:defect添加note shijing 2024-12-25 10:13:44 +0800
• 039cb3108b fix: mpointstat safe_get_or_create caoqianming 2024-12-24 22:08:43 +0800
• 43509aa25a feat: mpointstat safe_get_or_create caoqianming 2024-12-24 21:59:41 +0800
• a8f9583f7f feat: 增加safe_get_or_create方法 caoqianming 2024-12-24 21:58:53 +0800
• 71ab520f3e fix: enstat_cen_consume_unit change bug caoqianming 2024-12-24 18:35:04 +0800
• 4a642b9014 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2024-12-24 18:20:52 +0800
• f90bcd530b feat: 变更enstat排序 caoqianming 2024-12-24 18:20:40 +0800
• 13c4fb6663 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server zty 2024-12-24 18:09:03 +0800
• bcaa69ab30 feat：task 修改 更新 bill_date zty 2024-12-24 18:09:01 +0800
• 841ece1d4f feat: 工段计算公式校正 caoqianming 2024-12-24 17:54:46 +0800
• f5fd9558ba feat: 修改 task bill_date zty 2024-12-24 15:49:20 +0800
• aa3ba099be Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server zty 2024-12-24 09:26:59 +0800
• 978d8f3577 feat: 增加定时任务 每天更新bill_date(出厂水泥采集) zty 2024-12-24 09:26:57 +0800
• 27e3dfa3b3 feat: db_ins_mplogx bill_date bug caoqianming 2024-12-23 18:31:02 +0800
• cbcba52ff4 fix: QctTestItemSerializer 细化返回信息 caoqianming 2024-12-23 15:55:53 +0800
• 91dacba668 fix: QctDetailSerializer bug caoqianming 2024-12-23 15:29:10 +0800
• 4eb8aeca96 feat: qct增加筛选条件 caoqianming 2024-12-23 10:52:14 +0800
• f4c84f0354 feat: testitem add_info_for_list caoqianming 2024-12-20 17:49:40 +0800
• 4ab711cc71 feat: formula 调整到testitem caoqianming 2024-12-20 15:46:32 +0800
• 7fa065ce88 feat: QctTestItem 增加字段 caoqianming 2024-12-20 14:42:03 +0800
• b289c7813e feat: qct 重构 caoqianming 2024-12-19 15:10:12 +0800
• 796cdbc615 feat: base listmixin描述去除 caoqianming 2024-12-19 11:07:08 +0800
• 1647b2f06e fix: 增加检测模板功能字段 bug caoqianming 2024-12-19 11:04:16 +0800
• e7c08dc16c fix: 增加检测模板功能QctItemSerializer bug caoqianming 2024-12-19 10:12:24 +0800
• 468f5ffdbf feat: 增加检测模板功能 caoqianming 2024-12-19 10:11:27 +0800
• c58be8cdc3 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2024-12-18 14:53:33 +0800
• ddb517d1f8 feat: material增加tracking字段 caoqianming 2024-12-18 14:53:21 +0800
• c08dff56bf Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server zty 2024-12-18 14:16:14 +0800
• 0df2506f26 feat: 修改 enm/qua_data 排序问题 zty 2024-12-18 14:16:11 +0800
• e62f7e5a9c feat: cal_real_task_count 纳入div_number caoqianming 2024-12-18 11:08:42 +0800
• 92145451e3 feat: route增加div_number字段3 caoqianming 2024-12-18 09:08:25 +0800
• 2a5926f95b feat: route增加div_number字段2 caoqianming 2024-12-18 09:06:55 +0800
• f653c2c191 feat: route增加div_number字段 caoqianming 2024-12-18 09:06:11 +0800
• 7937a632a0 feat: process增加mtype caoqianming 2024-12-17 17:20:54 +0800
• 7d2d74ee80 feat: 日志操作时对有ticket的进行处理 caoqianming 2024-12-17 13:37:22 +0800
• c3338d05c2 feat：ftestwork_audit_end时get_alldata_with_batch_and_store caoqianming 2024-12-17 13:31:53 +0800
• 7ad5bad137 feat: defect create update时进行限制 caoqianming 2024-12-17 13:28:29 +0800
• 9a14216b78 feat: qm增加defect caoqianming 2024-12-17 09:42:11 +0800
• 8928c0b7aa feat: base get_user_route 排除route_name为空的 caoqianming 2024-12-16 17:02:54 +0800
• c0136400d6 feat: get_user_route 排除path为空的 caoqianming 2024-12-16 16:51:53 +0800
• bdd644a527 fix: 日志撤销的同时将任务变更状态 caoqianming 2024-12-16 13:06:02 +0800
• 7e578b52c2 feat: 调整permission以支持后端路由2 caoqianming 2024-12-16 08:50:48 +0800
• 28d89176e6 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2024-12-13 18:09:45 +0800
• 5572b4cb0f feat: enstat update权限 caoqianming 2024-12-13 18:09:29 +0800