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

• 7cca8b7277 fix: handover需要进行3层校验 caoqianming 2025-03-13 12:02:43 +0800
• 31ef257a60 feat: attrs["count"] = len(attrs["handoverb"]) caoqianming 2025-03-13 10:58:09 +0800
• 71b67b7210 feat: miodo 所属部门可不编辑 caoqianming 2025-03-13 09:56:15 +0800
• c0ffb175a9 feat: wpmw number允许重复 caoqianming 2025-03-12 16:10:44 +0800
• 64ca8b97ad fix: mlogbw删除bug2 caoqianming 2025-03-12 14:55:43 +0800
• 8bd3e120df fix: mlogbw删除bug caoqianming 2025-03-12 14:53:28 +0800
• e52b894603 fix: mlogbw delete bug3 caoqianming 2025-03-12 14:28:11 +0800
• 459d2348d4 fix: mlogbw delete bug2 caoqianming 2025-03-12 14:24:01 +0800
• d847b84fd8 fix: mlogbw delete bug caoqianming 2025-03-12 14:21:37 +0800
• 90e0e7ad3b fix: mlogbin delete数据 caoqianming 2025-03-12 14:10:34 +0800
• 8d67c06e63 feat: 生成产出出错2的bug caoqianming 2025-03-12 13:34:56 +0800
• 378648436f fix: 生成产出出错3的bug caoqianming 2025-03-12 11:22:50 +0800
• 9a7230d752 feat: 自动生成任务编号 caoqianming 2025-03-12 09:35:24 +0800
• 5a05710ff2 feat: 增加mlogbw_to以进行追踪 caoqianming 2025-03-12 09:23:38 +0800
• c74de4ef21 fix: mio自动生成编号 caoqianming 2025-03-11 13:25:11 +0800
• 5bd17c4a37 feat: mio自动生成编号 caoqianming 2025-03-11 12:40:45 +0800
• f59cb2cbc2 feat: 个拆批2 caoqianming 2025-03-10 17:58:09 +0800
• 75ec24702c feat: 个拆批 caoqianming 2025-03-10 17:48:11 +0800
• 8f46507a6b feat: mlogbin时从单个拆分为多个批次2 caoqianming 2025-03-10 16:03:50 +0800
• 85cc38c842 feat: mlogbin时从单个拆分为多个批次 caoqianming 2025-03-10 16:00:01 +0800
• f295956c69 fix: mlogbw cal_count_notok caoqianming 2025-03-10 11:29:43 +0800
• fbb18ae990 feat: 部分bug修复 caoqianming 2025-03-09 11:36:17 +0800
• cb45e0bab1 feat: 子任务可为空以及一些查询条件 caoqianming 2025-03-07 13:00:00 +0800
• 25d63c0b27 feat: fmlog update 更新是否可用字段 caoqianming 2025-03-07 11:00:57 +0800
• 456f05a83e feat: 针对加工前不良的处理2 caoqianming 2025-03-07 10:42:27 +0800
• 330d44e2a3 feat: 优化一下mlogbdefect的代码结构 caoqianming 2025-03-07 10:09:49 +0800
• fd26a65966 feat: qct get bug caoqianming 2025-03-07 09:20:41 +0800
• 8a715ed136 feat: wpm revert支持加工强不良 caoqianming 2025-03-07 09:20:20 +0800
• 925bc2027c feat: mlogb_submit支持加工前不良 caoqianming 2025-03-07 08:51:22 +0800
• 2a9bd7ef6a feat: mlogbdefect defect可为空代表合格品 caoqianming 2025-03-07 08:51:01 +0800
• 1844fa7228 feat: mlogb添加字段 caoqianming 2025-03-06 19:00:04 +0800
• e2fbc63293 feat: 支持传入加工前不良的数据 caoqianming 2025-03-06 18:51:18 +0800
• 73b3ab9377 feat: handover增加筛选条件 caoqianming 2025-03-06 16:36:32 +0800
• f7843621df feat: wm 增加 来料/完成 筛选 caoqianming 2025-03-06 16:15:08 +0800
• 4f60483a49 feat: qct get_qs接口 bug caoqianming 2025-03-06 15:35:19 +0800
• 0d45c380c0 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2025-03-06 15:26:14 +0800
• 767896f3dc feat: qct get_qs接口 caoqianming 2025-03-06 15:26:11 +0800
• 3a1ed151c7 feat: qctdefect 返回时添加defect_okcate caoqianming 2025-03-06 14:20:26 +0800
• 74f0db77ed feat: Handoverb 支持拆批 caoqianming 2025-03-06 14:15:45 +0800
• afdcc5374e feat: 添加wmaterial检索字段 caoqianming 2025-03-06 09:02:07 +0800
• 33957216cd feat: handover recive user可为空 caoqianming 2025-03-06 09:01:45 +0800
• deb50efba1 feat: 添加wmaterial筛选条件 caoqianming 2025-03-06 09:01:23 +0800
• c8ba7dc563 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server zty 2025-03-05 18:36:10 +0800
• 0dd62244ab feat: 修改采集更新时间换成 data_time zty 2025-03-05 18:36:07 +0800
• 62d2c8b21e feat: inm batch textfield caoqianming 2025-03-04 18:08:52 +0800
• 47976de657 feat: 使用身份证强校验函数 caoqianming 2025-03-04 16:27:00 +0800
• a8ce6c3989 feat: base 添加身份证校验函数 caoqianming 2025-03-04 16:26:35 +0800
• df427d60b2 fix: mlog ftestwork submit关于合格b类的调整 caoqianming 2025-03-04 15:45:56 +0800
• aa32047bf7 fix: 一些bug调整 caoqianming 2025-03-04 12:33:51 +0800
• 71cbda504c fix: ftestwork validate bug caoqianming 2025-03-04 09:07:30 +0800
• 46d586430e fix: FmlogViewSet test caoqianming 2025-03-03 19:09:17 +0800
• eca0f26623 fix: bulk create bug caoqianming 2025-03-03 19:05:27 +0800
• 07f60a1a29 feat: mlogbdefect返回defect_okcate caoqianming 2025-03-03 19:00:51 +0800
• de27865a3b fix: swagger bug caoqianming 2025-03-03 18:29:36 +0800
• 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