Commit Graph

Select branches

Hide Pull Requests

base

gzerp

master

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

Mono Color

• b20dee64df feat: mlogbin删除时需要删除子集ftest记录 caoqianming 2025-01-09 08:58:24 +0800
• 51123ee0c5 feat: mlogbw增加质检保存bug caoqianming 2025-01-09 08:43:32 +0800
• a20b15abed feat: mlogbw增加质检统计3 caoqianming 2025-01-08 16:43:47 +0800
• 396fcdd7cc feat: mlogbw增加质检统计2 caoqianming 2025-01-08 16:34:13 +0800
• 5f88433a25 feat: mlogbw增加质检统计 caoqianming 2025-01-08 16:21:18 +0800
• 2331bec13b feat: 增加MlogbDefect以进行统计 caoqianming 2025-01-08 15:02:41 +0800
• 22ff47a6ba feat: init_by_qct caoqianming 2025-01-08 12:17:59 +0800
• 8eddeb4f70 fix: mlogb质检 caoqianming 2025-01-08 10:29:12 +0800
• 95b98df8cf fix: mlogb找寻质检表 caoqianming 2025-01-07 15:41:04 +0800
• 38aa64df12 feat: 检测编号改为textfield caoqianming 2025-01-07 15:37:14 +0800
• 7c9feb23ac feat: mlogb添加qct字段以便调用检验表 caoqianming 2025-01-07 15:29:19 +0800
• 98f4af2f8c fix: 如果是主要输入物料且是主批次，才需生成输出3 caoqianming 2025-01-07 14:38:34 +0800
• abd6ca53f1 feat: Mlogb返回增加树型结构 caoqianming 2025-01-07 14:31:10 +0800
• e333b84c1b feat: Mlogb添加parent字段 caoqianming 2025-01-07 14:24:00 +0800
• d3a304b918 feat: Mlogb的排序 caoqianming 2025-01-07 14:08:32 +0800
• 011df65e4c fix: 如果是主要输入物料且是主批次，才需生成输出 caoqianming 2025-01-07 14:07:25 +0800
• c8594aaa99 feat: wm添加route查询条件 caoqianming 2025-01-07 13:52:31 +0800
• ccac1aea87 feat: 如果是主要输入物料且是主批次，才需生成输出2 caoqianming 2025-01-07 13:23:55 +0800
• 0e428f6c9d feat: 如果是主要输入物料且是主批次，才需生成输出 caoqianming 2025-01-07 11:10:07 +0800
• f8c72a1487 feat: 增加routemat表 caoqianming 2025-01-07 09:50:44 +0800
• 3efeb746dc feat: wprlist增加筛选条件 caoqianming 2025-01-07 08:38:47 +0800
• 8afbc9a0b5 feat: wprlist默认排除已消耗的2 caoqianming 2025-01-06 17:08:48 +0800
• 0673580d3b feat: wprlist默认排除已消耗的 caoqianming 2025-01-06 17:06:00 +0800
• 9f56968385 fix: change_or_new该物料编号已存在不可使用 caoqianming 2025-01-06 16:12:33 +0800
• 561fb94930 fix: MlogbwCreateUpdateSerializer validate bug caoqianming 2025-01-06 14:56:17 +0800
• afb3b23486 feat: mlogbin自动创建mlogbout数量2 caoqianming 2025-01-06 14:09:10 +0800
• b454972943 feat: mlogbin自动创建mlogbout数量 caoqianming 2025-01-06 13:46:23 +0800
• 49d1b95968 feat: handoverbw的处理2 caoqianming 2025-01-06 11:34:03 +0800
• 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