Commit Graph

3032 Commits

Author SHA1 Message Date
caoqianming 9489f80b3f fix: 个到个的拆分bug9 2025-03-14 16:32:55 +08:00
caoqianming 42f5c20f86 fix: 个到个的拆分bug8 2025-03-14 16:32:02 +08:00
caoqianming 099fe4b18b fix: 个到个的拆分bug7 2025-03-14 16:10:40 +08:00
caoqianming a66d47ec47 fix: 个到个的拆分bug6 2025-03-14 16:06:49 +08:00
caoqianming 43ca73ab15 feat: 添加update_dict函数 2025-03-14 16:02:06 +08:00
caoqianming c8cde0a436 fix: 个到个的拆分bug5 2025-03-14 16:01:54 +08:00
caoqianming 6fa9c9182b fix: 个到个的拆分bug4 2025-03-14 15:35:37 +08:00
caoqianming 82b4f39fed fix: 个到个的拆分bug3 2025-03-14 15:28:26 +08:00
caoqianming 60a7827e1b fix: 个到个的拆分bug2 2025-03-14 15:20:32 +08:00
caoqianming 5ba937ecd8 fix: 个到个的拆分bug 2025-03-14 14:29:36 +08:00
caoqianming 20e431cb7d feat: mtask添加筛选条件 2025-03-14 14:16:54 +08:00
caoqianming 7488900ac8 feat: mlogbw destory bug 2025-03-14 13:17:53 +08:00
caoqianming b067ec2ea7 fix: handover validate handoverbw的bug 2025-03-14 09:57:28 +08:00
caoqianming 143408ab4f feat: 添加mes的清空数据操作 2025-03-14 09:05:31 +08:00
caoqianming dcfa6155a9 feat: 调整wpmw允许编号重复 2025-03-14 09:02:49 +08:00
caoqianming f58b84a4ee feat: 物料编号允许非不同物料的重复 2025-03-13 17:37:54 +08:00
caoqianming dafdb8f608 fix: 调整数据结构4 2025-03-13 17:13:34 +08:00
caoqianming 9ef752cb05 fix: 调整数据结构3 2025-03-13 17:11:02 +08:00
caoqianming a350d97202 fix: 调整数据结构2 2025-03-13 16:58:07 +08:00
caoqianming ed80edbef8 fix: 调整数据结构 2025-03-13 16:46:32 +08:00
caoqianming 38dc9199e2 feat: 调整数据结构 2025-03-13 16:33:59 +08:00
caoqianming f43726a884 fix: mlogbin 删除时未对应删除mlogbout的bug 2025-03-13 12:48:16 +08:00
caoqianming 7cca8b7277 fix: handover需要进行3层校验 2025-03-13 12:02:43 +08:00
caoqianming 31ef257a60 feat: attrs["count"] = len(attrs["handoverb"]) 2025-03-13 10:58:09 +08:00
caoqianming 71b67b7210 feat: miodo 所属部门可不编辑 2025-03-13 09:56:15 +08:00
caoqianming c0ffb175a9 feat: wpmw number允许重复 2025-03-12 16:10:44 +08:00
caoqianming 64ca8b97ad fix: mlogbw删除bug2 2025-03-12 14:55:43 +08:00
caoqianming 8bd3e120df fix: mlogbw删除bug 2025-03-12 14:53:28 +08:00
caoqianming e52b894603 fix: mlogbw delete bug3 2025-03-12 14:28:11 +08:00
caoqianming 459d2348d4 fix: mlogbw delete bug2 2025-03-12 14:24:01 +08:00
caoqianming d847b84fd8 fix: mlogbw delete bug 2025-03-12 14:21:37 +08:00
caoqianming 90e0e7ad3b fix: mlogbin delete数据 2025-03-12 14:10:34 +08:00
caoqianming 8d67c06e63 feat: 生成产出出错2的bug 2025-03-12 13:34:56 +08:00
caoqianming 378648436f fix: 生成产出出错3的bug 2025-03-12 11:22:50 +08:00
caoqianming 9a7230d752 feat: 自动生成任务编号 2025-03-12 09:35:24 +08:00
caoqianming 5a05710ff2 feat: 增加mlogbw_to以进行追踪 2025-03-12 09:23:38 +08:00
caoqianming c74de4ef21 fix: mio自动生成编号 2025-03-11 13:25:11 +08:00
caoqianming 5bd17c4a37 feat: mio自动生成编号 2025-03-11 12:40:45 +08:00
caoqianming f59cb2cbc2 feat: 个拆批2 2025-03-10 17:58:09 +08:00
caoqianming 75ec24702c feat: 个拆批 2025-03-10 17:48:11 +08:00
caoqianming 8f46507a6b feat: mlogbin时从单个拆分为多个批次2 2025-03-10 16:03:50 +08:00
caoqianming 85cc38c842 feat: mlogbin时从单个拆分为多个批次 2025-03-10 16:00:01 +08:00
caoqianming f295956c69 fix: mlogbw cal_count_notok 2025-03-10 11:29:43 +08:00
caoqianming fbb18ae990 feat: 部分bug修复 2025-03-09 11:36:17 +08:00
caoqianming cb45e0bab1 feat: 子任务可为空以及一些查询条件 2025-03-07 13:00:00 +08:00
caoqianming 25d63c0b27 feat: fmlog update 更新是否可用字段 2025-03-07 11:00:57 +08:00
caoqianming 456f05a83e feat: 针对加工前不良的处理2 2025-03-07 10:42:27 +08:00
caoqianming 330d44e2a3 feat: 优化一下mlogbdefect的代码结构 2025-03-07 10:09:49 +08:00
caoqianming fd26a65966 feat: qct get bug 2025-03-07 09:20:41 +08:00
caoqianming 8a715ed136 feat: wpm revert支持加工强不良 2025-03-07 09:20:20 +08:00
caoqianming 925bc2027c feat: mlogb_submit支持加工前不良 2025-03-07 08:51:22 +08:00
caoqianming 2a9bd7ef6a feat: mlogbdefect defect可为空代表合格品 2025-03-07 08:51:01 +08:00
caoqianming 1844fa7228 feat: mlogb添加字段 2025-03-06 19:00:04 +08:00
caoqianming e2fbc63293 feat: 支持传入加工前不良的数据 2025-03-06 18:51:18 +08:00
caoqianming 73b3ab9377 feat: handover增加筛选条件 2025-03-06 16:36:32 +08:00
caoqianming f7843621df feat: wm 增加 来料/完成 筛选 2025-03-06 16:15:08 +08:00
caoqianming 4f60483a49 feat: qct get_qs接口 bug 2025-03-06 15:35:19 +08:00
caoqianming 0d45c380c0 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2025-03-06 15:26:14 +08:00
caoqianming 767896f3dc feat: qct get_qs接口 2025-03-06 15:26:11 +08:00
caoqianming 3a1ed151c7 feat: qctdefect 返回时添加defect_okcate 2025-03-06 14:20:26 +08:00
caoqianming 74f0db77ed feat: Handoverb 支持拆批 2025-03-06 14:15:45 +08:00
caoqianming afdcc5374e feat: 添加wmaterial检索字段 2025-03-06 09:02:07 +08:00
caoqianming 33957216cd feat: handover recive user可为空 2025-03-06 09:01:45 +08:00
caoqianming deb50efba1 feat: 添加wmaterial筛选条件 2025-03-06 09:01:23 +08:00
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