Commit Graph

3095 Commits

Author SHA1 Message Date
zty c8ba7dc563 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2025-03-05 18:36:10 +08:00
zty 0dd62244ab feat: 修改采集更新时间换成 data_time 2025-03-05 18:36:07 +08:00
caoqianming 62d2c8b21e feat: inm batch textfield 2025-03-04 18:08:52 +08:00
caoqianming 47976de657 feat: 使用身份证强校验函数 2025-03-04 16:27:00 +08:00
caoqianming a8ce6c3989 feat: base 添加身份证校验函数 2025-03-04 16:26:35 +08:00
caoqianming df427d60b2 fix: mlog ftestwork submit关于合格b类的调整 2025-03-04 15:45:56 +08:00
caoqianming aa32047bf7 fix: 一些bug调整 2025-03-04 12:33:51 +08:00
caoqianming 71cbda504c fix: ftestwork validate bug 2025-03-04 09:07:30 +08:00
caoqianming 46d586430e fix: FmlogViewSet test 2025-03-03 19:09:17 +08:00
caoqianming eca0f26623 fix: bulk create bug 2025-03-03 19:05:27 +08:00
caoqianming 07f60a1a29 feat: mlogbdefect返回defect_okcate 2025-03-03 19:00:51 +08:00
caoqianming de27865a3b fix: swagger bug 2025-03-03 18:29:36 +08:00
caoqianming 9907bf7c43 feat: mlog填写支持defect定义 2025-03-03 18:21:03 +08:00
caoqianming 5245689ec2 feat: ftestwork create update serializer 2025-03-03 16:17:52 +08:00
caoqianming 8fdd56555f feat: testitem description可为空 2025-03-03 15:53:00 +08:00
caoqianming 7e40596665 fix: mlogbupdate bug 2025-03-03 15:47:53 +08:00
caoqianming 666fbd306b fix: 获取qct提出到model 2025-03-03 15:13:28 +08:00
caoqianming bbed6fa646 feat: mlogbdefect添加字段floor 2025-03-03 14:50:26 +08:00
caoqianming 6ad6670a90 feat: mlogbdetail 增加返回mlogbdefect 2025-02-28 17:06:50 +08:00
caoqianming 7c7dcee194 fix: cal_count_notok bug2 2025-02-28 16:57:46 +08:00
caoqianming 2311e1773f fix: cal_count_notok bug 2025-02-28 16:49:08 +08:00
caoqianming 278e55c08a fix: cal_count_notok 是一个类方法 2025-02-28 16:39:49 +08:00
caoqianming 12416a4f61 fix: mlogbw create bug2 2025-02-28 16:30:47 +08:00
caoqianming 9eb3abefc4 fix: mlogbw create bug 2025-02-28 16:27:23 +08:00
caoqianming a2fb5598f8 fix: get_alldata_with_batch 除0bug 2025-02-28 16:23:24 +08:00
caoqianming 31e8b92d29 feat: mlogbin create时处理qct 2025-02-28 15:50:23 +08:00
caoqianming c5bcfb4e53 feat: mlogboutupdate兼容性处理 2025-02-28 15:38:36 +08:00
caoqianming 286a5306e3 feat: 批次处理做兼容性处理 2025-02-28 15:31:38 +08:00
caoqianming 77f7a454a1 feat: mlogbw变更出发mlogbdefect 2025-02-28 11:28:40 +08:00
caoqianming fac85d17d2 feat: defect code设置为非必填 2025-02-28 09:50:30 +08:00
caoqianming fb7fbb7388 fix: drf swagger bug 2025-02-28 09:41:13 +08:00
caoqianming 1bddfaa920 fix: get_alldata_with_batch bug 2025-02-28 09:18:10 +08:00
caoqianming b2f801deda feat: 添加mlogbdefect 2025-02-28 09:14:55 +08:00
caoqianming d69d4568f6 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2025-02-27 16:59:24 +08:00
caoqianming 8c4b11d9c9 feat: mb添加查询条件state 2025-02-27 16:59:20 +08:00
zty ea5e041575 feat: enm/task 修改班时校正 2025-02-27 14:28:32 +08:00
caoqianming bf35064f6e feat: 优化em增加采集数据方法 2025-02-27 12:37:17 +08:00
caoqianming d30ecabd16 feat: em增加采集数据方法2 2025-02-27 12:24:27 +08:00
caoqianming 1925e3e5d6 feat: em增加采集数据方法 2025-02-27 11:34:19 +08:00
caoqianming 1dbb07ddcb feat: route支持传入material_out_tracking 2 2025-02-26 17:37:29 +08:00
caoqianming d1c15b0b2e feat: route支持传入material_out_tracking 2025-02-26 17:36:52 +08:00
caoqianming 39eef7d2b4 fix: material_out.tracking的比较bug 2025-02-26 12:07:02 +08:00
caoqianming c71bb0d8f6 fix: 不能删除该产出明细更新限制条件 2025-02-26 11:27:25 +08:00
caoqianming ccce92f9f6 feat: testitem添加采集表达式 2025-02-26 09:19:48 +08:00
caoqianming 2010078665 perf: 优化mlog list速度3 2025-02-25 17:33:41 +08:00
caoqianming 4e6aa547b5 perf: 优化mlog list速度2 2025-02-25 17:30:40 +08:00
caoqianming 6653befcdb perf: 优化mlog list速度 2025-02-25 16:33:54 +08:00
caoqianming 571e11cc8c feat: wpr修改排序按number 2025-02-25 15:57:43 +08:00
caoqianming 73bc1bac2e fix: wpr number需要唯一 2025-02-25 15:42:46 +08:00
caoqianming 3ce03827bf fix: 出入库change_or_new要处理ftest 2025-02-25 15:10:43 +08:00