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

3.1.2026071608

3.1.2026071614

3.1.2026072309

3.1.2026072316

3.1.2026072713

Mono Color

• 9907bf7c43 feat: mlog填写支持defect定义 caoqianming 2025-03-03 18:21:03 +0800
• 5245689ec2 feat: ftestwork create update serializer caoqianming 2025-03-03 16:17:52 +0800
• 8fdd56555f feat: testitem description可为空 caoqianming 2025-03-03 15:53:00 +0800
• 7e40596665 fix: mlogbupdate bug caoqianming 2025-03-03 15:47:53 +0800
• 666fbd306b fix: 获取qct提出到model caoqianming 2025-03-03 15:13:28 +0800
• bbed6fa646 feat: mlogbdefect添加字段floor caoqianming 2025-03-03 14:50:26 +0800
• 6ad6670a90 feat: mlogbdetail 增加返回mlogbdefect caoqianming 2025-02-28 17:06:50 +0800
• 7c7dcee194 fix: cal_count_notok bug2 caoqianming 2025-02-28 16:57:46 +0800
• 2311e1773f fix: cal_count_notok bug caoqianming 2025-02-28 16:49:08 +0800
• 278e55c08a fix: cal_count_notok 是一个类方法 caoqianming 2025-02-28 16:39:49 +0800
• 12416a4f61 fix: mlogbw create bug2 caoqianming 2025-02-28 16:30:47 +0800
• 9eb3abefc4 fix: mlogbw create bug caoqianming 2025-02-28 16:27:23 +0800
• a2fb5598f8 fix: get_alldata_with_batch 除0bug caoqianming 2025-02-28 16:23:24 +0800
• 31e8b92d29 feat: mlogbin create时处理qct caoqianming 2025-02-28 15:50:23 +0800
• c5bcfb4e53 feat: mlogboutupdate兼容性处理 caoqianming 2025-02-28 15:38:36 +0800
• 286a5306e3 feat: 批次处理做兼容性处理 caoqianming 2025-02-28 15:31:38 +0800
• 77f7a454a1 feat: mlogbw变更出发mlogbdefect caoqianming 2025-02-28 11:28:40 +0800
• fac85d17d2 feat: defect code设置为非必填 caoqianming 2025-02-28 09:50:30 +0800
• fb7fbb7388 fix: drf swagger bug caoqianming 2025-02-28 09:41:13 +0800
• 1bddfaa920 fix: get_alldata_with_batch bug caoqianming 2025-02-28 09:18:10 +0800
• b2f801deda feat: 添加mlogbdefect caoqianming 2025-02-28 09:14:55 +0800
• d69d4568f6 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2025-02-27 16:59:24 +0800
• 8c4b11d9c9 feat: mb添加查询条件state caoqianming 2025-02-27 16:59:20 +0800
• ea5e041575 feat: enm/task 修改班时校正 zty 2025-02-27 14:28:32 +0800
• bf35064f6e feat: 优化em增加采集数据方法 caoqianming 2025-02-27 12:37:17 +0800
• d30ecabd16 feat: em增加采集数据方法2 caoqianming 2025-02-27 12:24:27 +0800
• 1925e3e5d6 feat: em增加采集数据方法 caoqianming 2025-02-27 11:34:19 +0800
• 1dbb07ddcb feat: route支持传入material_out_tracking 2 caoqianming 2025-02-26 17:37:29 +0800
• d1c15b0b2e feat: route支持传入material_out_tracking caoqianming 2025-02-26 17:36:52 +0800
• 39eef7d2b4 fix: material_out.tracking的比较bug caoqianming 2025-02-26 12:07:02 +0800
• c71bb0d8f6 fix: 不能删除该产出明细更新限制条件 caoqianming 2025-02-26 11:27:25 +0800
• ccce92f9f6 feat: testitem添加采集表达式 caoqianming 2025-02-26 09:19:48 +0800
• 2010078665 perf: 优化mlog list速度3 caoqianming 2025-02-25 17:33:41 +0800
• 4e6aa547b5 perf: 优化mlog list速度2 caoqianming 2025-02-25 17:30:40 +0800
• 6653befcdb perf: 优化mlog list速度 caoqianming 2025-02-25 16:33:54 +0800
• 571e11cc8c feat: wpr修改排序按number caoqianming 2025-02-25 15:57:43 +0800
• 73bc1bac2e fix: wpr number需要唯一 caoqianming 2025-02-25 15:42:46 +0800
• 3ce03827bf fix: 出入库change_or_new要处理ftest caoqianming 2025-02-25 15:10:43 +0800
• 2e9f858205 fix: cal_real_task_count 在子任务数量上错误 caoqianming 2025-02-25 15:05:54 +0800
• 0e96485fae feat: mioitem添加count_tested caoqianming 2025-02-25 10:33:22 +0800
• 32ba222523 fix: mlog_submit process获取bug caoqianming 2025-02-24 17:29:00 +0800
• 63004f81ca fix: mlog_submit tracking获取方式 caoqianming 2025-02-24 17:21:28 +0800
• 14cad30b2e fix: mlog_submit is_fix bug caoqianming 2025-02-24 17:14:33 +0800
• debf07a7b9 feat: mlogbdetail 返回时携带tracking caoqianming 2025-02-24 16:20:56 +0800
• 2e8ca4a14d fix: mlogbin perform_create处理返工的bug caoqianming 2025-02-24 16:12:46 +0800
• 2941ebd7d6 fix: mlogbinserializer处理返工的错误 caoqianming 2025-02-24 16:06:55 +0800
• 2663f20953 feat: 返修逻辑完成 caoqianming 2025-02-24 13:22:43 +0800
• 553fbcc826 feat: labelmat和wpr都加上返修Enum caoqianming 2025-02-24 10:26:00 +0800
• 0c5cc55b54 feat: 用于返修的mlog caoqianming 2025-02-24 09:39:05 +0800
• 54db14937e feat: base django升级新的migration caoqianming 2025-02-23 11:03:28 +0800
• 986c82f838 Merge branch 'base' of https://github.com/caoqianming/xt_server into base caoqianming 2025-02-23 11:53:06 +0800
• 434002ba98 feat: 非必要包后续在函数中导入 caoqianming 2025-02-21 18:13:03 +0800
• a8477ce63e feat: 升级三方包 caoqianming 2025-02-21 18:12:30 +0800
• c4f86cf961 feat: 非必要包后续在函数中导入 caoqianming 2025-02-21 18:13:03 +0800
• f79f40b9ad feat: 升级三方包 caoqianming 2025-02-21 18:12:30 +0800
• af999467db fix: 去除materialbatch的数据库约束 caoqianming 2025-02-21 17:23:28 +0800
• a1525d1289 fix: mb create加锁 caoqianming 2025-02-21 17:05:50 +0800
• 07473ddf90 feat: mio出入库支持选入mioitemw caoqianming 2025-02-21 11:01:47 +0800
• 74a7025f6c feat: wm_in 在mlogbin时必填 caoqianming 2025-02-20 17:02:36 +0800
• 7200bc45b3 fix: do_in xmaterial的type error caoqianming 2025-02-20 14:48:18 +0800
• 7b484a65cd feat: route添加document字段 caoqianming 2025-02-19 15:35:15 +0800
• c585f2fc11 feat: mlogbin支持mtask非必填 caoqianming 2025-02-19 14:29:55 +0800
• 5f0d34f9c3 feat: route添加parent字段以支持子步骤 caoqianming 2025-02-19 14:02:29 +0800
• f741eda285 feat: 七车间入库_仓库执行人 remove None caoqianming 2025-02-18 17:45:42 +0800
• f5229ab8cb feat: ftestwork_submit 时根据工段配置生成不合格品 caoqianming 2025-02-18 11:09:49 +0800
• b062d7ef6b fix: cal_material_count 挪到单独文件里 caoqianming 2025-02-18 11:03:22 +0800
• 56d49b4d26 fix: cal_material_count 只统计合格品 caoqianming 2025-02-18 10:56:09 +0800
• edac22b701 feat: cal_material_count 改为同步执行 caoqianming 2025-02-18 10:51:31 +0800
• b3d060b25a feat: cal_material_count_from_mlog caoqianming 2025-02-18 10:42:59 +0800
• 7b87e79bf5 feat: 部分app model注释 caoqianming 2025-02-18 09:02:28 +0800
• 855ca9b054 feat: wpm和wpmw表添加doc2 caoqianming 2025-02-17 16:57:50 +0800
• 12c6cc0d17 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2025-02-17 16:17:09 +0800
• 89642fb194 feat: wpm和wpmw表添加doc caoqianming 2025-02-17 16:17:06 +0800
• 7544efdc1e Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server zty 2025-02-17 15:35:24 +0800
• 095a6f9d51 feat: enm/task view 修改校正测试 增加能修改 天和月的时间类型 zty 2025-02-17 15:35:21 +0800
• 9f558acedb feat: base execute_raw_sql时允许不返回值 caoqianming 2025-02-17 14:37:30 +0800
• 57e6e23e95 feat: equip添加采集数据请求字段 caoqianming 2025-02-17 14:35:43 +0800
• 8cbb921969 feat: 光子棒管综合统计添加数据 caoqianming 2025-02-17 11:24:43 +0800
• e6b27950b2 feat: ftestitem增加检测设备字段 caoqianming 2025-02-17 09:34:48 +0800
• 61525d236e feat: qct detail是检测项按顺序返回 caoqianming 2025-02-14 10:56:40 +0800
• d7361a71df perf: 优化has_envdata的sql查询2 caoqianming 2025-02-13 13:26:32 +0800
• 61f9dc3b51 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2025-02-13 11:26:30 +0800
• dbbdaa89b9 perf: 优化has_envdata的sql查询 caoqianming 2025-02-13 11:26:27 +0800
• 5ecb3341e0 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server zty 2025-02-12 17:34:09 +0800
• 5f85d0273c feat: 修改enm/task zty 2025-02-12 17:34:04 +0800
• 9d27ccd1dc fix: base get_user_route 路由重复的问题 caoqianming 2025-02-12 15:10:20 +0800
• 861bb03469 feat: wpmw添加字段 caoqianming 2025-02-12 15:10:00 +0800
• fd5130e4b3 feat: 修改系统名称 caoqianming 2025-02-11 15:25:08 +0800
• a88f7e282e feat: Ptest不指定testitem caoqianming 2025-02-11 14:53:26 +0800
• 7dc11e032d Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2025-02-11 14:40:41 +0800
• ac41f5a105 fix: 粗中细磨的统计要涵盖粗磨和粗中磨的数据 caoqianming 2025-02-11 14:40:38 +0800
• f7d6f59fcd feat: 修改 enm 回转窑产量计算 zty 2025-02-11 14:24:59 +0800
• 44486b64a3 feat: mlogbw的输出不允许删除 caoqianming 2025-02-11 11:12:14 +0800
• edfc63a2e2 feat: base 修改系统名称 caoqianming 2025-02-10 18:19:20 +0800
• f8416d91b6 feat: 增加mio返回is_tested caoqianming 2025-02-10 18:19:06 +0800
• b8c0a9b420 fix: 车间执行人和仓库人问题 caoqianming 2025-02-10 15:57:40 +0800
• 239692cbd6 feat: ops添加celery状态监控 caoqianming 2025-02-08 17:31:49 +0800
• 0eb0100e60 fix: auth get_user_by_username_or caoqianming 2025-02-08 16:57:38 +0800
• 1a3e428195 feat: do_in 支持wpr caoqianming 2025-02-08 15:31:35 +0800
• 33f162fa3a fix: do_in 的bug caoqianming 2025-02-08 14:49:30 +0800