Commit Graph

355 Commits

Author SHA1 Message Date
caoqianming a0084f7825 feat: mgroup增加自产和外协字段及相关逻辑校验 2025-03-19 14:32:24 +08:00
caoqianming 459fc3bbe8 feat: mgroup增加自产和外协字段及相关逻辑 2025-03-19 14:27:07 +08:00
caoqianming da084e21cb feat: wmaterial增加来源批次和物料 2025-03-19 13:35:27 +08:00
caoqianming 982fa7f373 fix: mlogbupdate serializer 2025-03-18 14:35:11 +08:00
caoqianming 232ecb0f45 fix: MlogbSerializer mlog字段只读 2025-03-18 10:47:46 +08:00
caoqianming 6d6e4e88ae fix: MlogbSerializer mlog字段取消 2025-03-18 10:36:58 +08:00
caoqianming f7e3e7977d feat: mlogb增加count_json 2025-03-18 10:30:13 +08:00
caoqianming 53a3105f10 fix: 转成 小数后的to_representation bug 2025-03-17 10:33:11 +08:00
caoqianming 5bda6adf92 fix: mlogdefect 非必填 2025-03-17 10:06:21 +08:00
caoqianming 10a5d3301e feat: 日志变更模型以支持小数 2025-03-17 09:55:31 +08:00
caoqianming 443a818aec feat: 一次填写的也mlogb_from 2025-03-14 18:14:43 +08:00
caoqianming 8f079c9d5d feat: 通过is_fix支持ftestwork转mlog 2025-03-14 17:07:08 +08:00
caoqianming b067ec2ea7 fix: handover validate handoverbw的bug 2025-03-14 09:57:28 +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 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 5a05710ff2 feat: 增加mlogbw_to以进行追踪 2025-03-12 09:23:38 +08:00
caoqianming 85cc38c842 feat: mlogbin时从单个拆分为多个批次 2025-03-10 16:00:01 +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 e2fbc63293 feat: 支持传入加工前不良的数据 2025-03-06 18:51:18 +08:00
caoqianming 73b3ab9377 feat: handover增加筛选条件 2025-03-06 16:36:32 +08:00
caoqianming 74f0db77ed feat: Handoverb 支持拆批 2025-03-06 14:15:45 +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 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 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 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 fb7fbb7388 fix: drf swagger bug 2025-02-28 09:41:13 +08:00
caoqianming b2f801deda feat: 添加mlogbdefect 2025-02-28 09:14:55 +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 debf07a7b9 feat: mlogbdetail 返回时携带tracking 2025-02-24 16:20:56 +08:00
caoqianming 2941ebd7d6 fix: mlogbinserializer处理返工的错误 2025-02-24 16:06:55 +08:00
caoqianming 2663f20953 feat: 返修逻辑完成 2025-02-24 13:22:43 +08:00
caoqianming 0c5cc55b54 feat: 用于返修的mlog 2025-02-24 09:39:05 +08:00
caoqianming 74a7025f6c feat: wm_in 在mlogbin时必填 2025-02-20 17:02:36 +08:00
caoqianming c585f2fc11 feat: mlogbin支持mtask非必填 2025-02-19 14:29:55 +08:00
caoqianming 861bb03469 feat: wpmw添加字段 2025-02-12 15:10:00 +08:00
caoqianming 2488e500ce fix: 获取可交接到的工段 2025-02-07 10:12:27 +08:00
caoqianming b96846d2c0 feat: 获取可交接到的工段 2025-02-07 10:04:12 +08:00
caoqianming 622d594795 feat: 优化mloginit报错提示 2025-02-06 16:56:06 +08:00
caoqianming 8a2e409c8a feat: 增加改版交接类型 2025-02-05 09:54:22 +08:00
caoqianming 89449eb7c6 feat: mlogbin 只校验主批是否重复 2025-01-22 10:14:49 +08:00
caoqianming e59a5894f3 fix: mlogbin allow_empty 2025-01-16 10:17:35 +08:00
caoqianming 6ea24b6b1c feat: MlogbInSerializer wm_in allow_blank False 2025-01-16 09:27:06 +08:00
caoqianming 8d4d0f7cbc fix: mlogbw create时进行wpr的校验 2025-01-14 11:27:40 +08:00
caoqianming a333810dd9 fix: handover create bug 2025-01-13 17:34:10 +08:00
caoqianming ced8692585 feat: handoverserializer 优化 2025-01-13 16:12:18 +08:00
caoqianming c03129ae81 feat: Handover正常交接不支持不合格品 2025-01-10 09:40:51 +08:00
caoqianming 533e3e09dc feat: wmserializer返回defect_name 2025-01-10 08:43:00 +08:00
caoqianming ef4a31c3a5 fix:MlogbwCreateUpdateSerializer bug2 2025-01-09 11:25:52 +08:00
caoqianming d33678a603 fix:MlogbwCreateUpdateSerializer bug 2025-01-09 11:15:15 +08:00
caoqianming 3c6aa3ea18 feat: 去除mlogbdefects2 2025-01-09 10:12:01 +08:00
caoqianming 3751b2f2e2 feat: 去除mlogbdefect 2025-01-09 10:07:51 +08:00
caoqianming 51123ee0c5 feat: mlogbw增加质检保存bug 2025-01-09 08:43:32 +08:00
caoqianming a20b15abed feat: mlogbw增加质检统计3 2025-01-08 16:43:47 +08:00
caoqianming 396fcdd7cc feat: mlogbw增加质检统计2 2025-01-08 16:34:13 +08:00
caoqianming 5f88433a25 feat: mlogbw增加质检统计 2025-01-08 16:21:18 +08:00
caoqianming 2331bec13b feat: 增加MlogbDefect以进行统计 2025-01-08 15:02:41 +08:00
caoqianming 8eddeb4f70 fix: mlogb质检 2025-01-08 10:29:12 +08:00
caoqianming e333b84c1b feat: Mlogb添加parent字段 2025-01-07 14:24:00 +08:00
caoqianming ccac1aea87 feat: 如果是主要输入物料且是主批次,才需生成输出2 2025-01-07 13:23:55 +08:00
caoqianming 0e428f6c9d feat: 如果是主要输入物料且是主批次,才需生成输出 2025-01-07 11:10:07 +08:00
caoqianming 9f56968385 fix: change_or_new该物料编号已存在不可使用 2025-01-06 16:12:33 +08:00
caoqianming 561fb94930 fix: MlogbwCreateUpdateSerializer validate bug 2025-01-06 14:56:17 +08:00
caoqianming b454972943 feat: mlogbin自动创建mlogbout数量 2025-01-06 13:46:23 +08:00
caoqianming 49d1b95968 feat: handoverbw的处理2 2025-01-06 11:34:03 +08:00
caoqianming 26c7652095 feat: handoverbw的处理 2025-01-06 11:02:08 +08:00
caoqianming d784ac8a3c feat: 生产日志追踪到个完善 2025-01-06 10:23:51 +08:00
caoqianming 8d0d5ebcd0 fix: 主要是wpmw change_or_new的修正 2025-01-03 14:37:57 +08:00
caoqianming 426be9d805 feat: 添加mlogbw接口 2025-01-02 15:36:55 +08:00
caoqianming ba41228d69 fix: 生产提交支持单个物料 2025-01-02 14:01:09 +08:00
caoqianming a69f718859 feat: mlog 支持handle_user 默认create_by 2024-12-04 12:22:52 +08:00
caoqianming 17697d6482 feat: 添加batchst路由 2024-12-02 13:39:43 +08:00
caoqianming 6396eff968 feat: fmlog 移除route字段 2024-11-28 17:06:42 +08:00
caoqianming 53322ed9ad feat: 兄弟件产出需要注意batch的修改 2024-11-24 17:22:03 +08:00
caoqianming a484c0021d fix: wm_in 找不到的错误 2024-11-24 16:07:11 +08:00
caoqianming 84f7de61bc fix: mlog update 没有消耗时的校验 2024-11-23 23:06:01 +08:00
caoqianming cb36aac9ca feat: 去除handover send强校验 2024-11-23 22:32:55 +08:00
caoqianming 580109aa9f fix: mlog 填写方式及handoverb的问题 2024-11-22 18:35:12 +08:00
caoqianming 05af336180 fix: mlog create 时的bug 2024-11-21 17:03:34 +08:00
caoqianming 1bfafdb0e4 feat: handover添加备注字段 2024-11-21 13:21:53 +08:00
caoqianming 1cb64b26af feat: mlog list 接口一点优化 2024-11-19 09:25:36 +08:00
caoqianming fdb06c6883 fix: 非合格/返修品不可使用 报错 2024-11-14 11:17:11 +08:00
caoqianming b9d9cf42cb feat: mlog serializer添加batch_ofrom等 2024-11-14 08:47:31 +08:00
caoqianming 7d9582fe34 feat: mlogb添加字段以追踪原料批次 2024-11-13 15:56:40 +08:00
caoqianming a6fadedee2 fix: handle_date使用localdate获取日期 2024-11-11 17:00:33 +08:00
caoqianming 6eec199488 feat: mlog create时校验mtask是否是下达状态 2024-11-07 09:40:32 +08:00
caoqianming bce4a44408 feat: wmaterial可按mtask进行查询过滤 2024-11-05 17:43:34 +08:00
zty cc5b521f5d feat: 煤粉热值校正 2024-09-30 16:21:44 +08:00
caoqianming 305fda44c2 feat: wmaterialserializer 增加count_cando返回 2024-09-18 09:34:55 +08:00
caoqianming f51bb48428 feat: handover serializer 优化 2024-09-13 12:53:55 +08:00
caoqianming 7a8bee5e59 feat: wmaterial增加count_working proptey 2024-09-12 11:19:00 +08:00
caoqianming c07d0666c0 fix: handoverb返回更多信息 2024-09-06 11:30:43 +08:00
caoqianming 4e5d16f7f6 feat: handoverb返回更多信息 2024-09-06 11:26:31 +08:00
caoqianming aab98fba62 fix: mlog update 错误 2024-09-06 11:16:23 +08:00
caoqianming ee89b0bded feat: handover 报废处理 2024-09-06 09:31:00 +08:00
caoqianming fbaf4b5767 feat: mlog 12 支持update 2024-09-05 19:08:51 +08:00
caoqianming ba8bc4fb72 fix: handover_submit 2024-09-05 17:50:04 +08:00
caoqianming 789ffe53d3 fix: handoverb支持编辑 2024-09-05 17:02:06 +08:00
caoqianming ee7b7a526c fix: handoverb 校验 2024-09-05 16:38:39 +08:00
caoqianming 38ba04cc80 fix: handoverserializer mgroup 处理 2024-09-05 15:52:22 +08:00
caoqianming 2ce99bc842 fix: handoverbserializer handoverb 2024-09-05 15:41:24 +08:00
caoqianming 4b44b40c77 fix: handoverb validate错误 2024-09-05 15:13:50 +08:00
caoqianming ec441d770b feat: handover create 对handoverb进行处理 2024-09-05 14:56:55 +08:00
caoqianming 51a649c864 feat: mlog返回routepack_name2 2024-09-05 14:17:54 +08:00
caoqianming 97dae72617 feat: 增加mloginit的可用字段 2024-09-05 13:57:46 +08:00
caoqianming a1871a3763 feat: mloginit 可填end_time及test_user_name 返回 2024-09-05 13:14:12 +08:00
caoqianming 0baec25a8b feat: handover count可不填写 2024-09-05 12:50:51 +08:00
caoqianming 308fa4c7ad feat: 报废交接时固定recive 2024-09-05 11:37:40 +08:00
caoqianming 2b9ec6d01c feat: 增加handoverb 2024-09-05 10:58:09 +08:00
caoqianming 0de377ddc4 feat: 去除 handle_date的日期校验 2024-09-05 09:35:54 +08:00
caoqianming 00853f395d feat: handle_date 根据work_time自动处理 2024-09-05 09:29:49 +08:00
caoqianming 982247ee70 feat: count_n_jgqbl 改为count_pn_jgqbl 2024-09-05 09:11:48 +08:00
caoqianming eb5a8df7e0 feat: mlog create 时校验 2024-09-04 18:21:32 +08:00
caoqianming 22052d1d82 fix: fmlog validate 未返回attrs 2024-09-04 16:21:00 +08:00
caoqianming c2649ec963 feat: mtask增加mtaskb的返回并在日志填写时校验 2024-09-04 16:13:50 +08:00
caoqianming bae2b7b8f5 feat: mlogb 校验 2024-09-04 15:50:07 +08:00
caoqianming 6e7e6c584e feat: 一二级日志录入 2024-09-04 15:25:14 +08:00
caoqianming 233591728a feat: fmlog创建时校验 2024-09-04 09:13:26 +08:00
caoqianming 170f3db824 feat: 添加fmlog 2024-09-04 09:04:37 +08:00
caoqianming bb311999e8 feat: mlogb 添加字段以记录分层检验信息 2024-09-03 14:16:18 +08:00
caoqianming 0148efba62 feat: process添加中间状态 2024-09-03 10:58:33 +08:00
caoqianming 31f8f002aa feat: mlog 增加ticket查询条件 2024-09-03 10:25:59 +08:00
caoqianming 6a573dd4dd feat: mlog经审批后提交 2024-09-03 09:10:28 +08:00
caoqianming b3e527e5a6 fix: count_n_jgqbl 字符错误 2024-09-02 16:58:16 +08:00
caoqianming 65c1c8aa40 fix: mlogb update serializer 2024-09-02 15:51:34 +08:00
caoqianming 5289e71280 feat: wmaterial添加外协字段及相关调整 2024-08-30 09:21:29 +08:00
caoqianming 301535813b feat: mlogbout 校验不合格字段 2024-08-29 15:13:08 +08:00
zty 62fb5aa54c feat: sflog teamchange cal_quastat_sflog 2024-08-16 18:45:11 +08:00
caoqianming ba6c30a745 feat: wmaterial增加state字段并进行相应处理 2024-08-15 10:41:36 +08:00
caoqianming ad1d0680b1 feat: mlogbupdate 校验 2024-08-13 15:06:07 +08:00
caoqianming bbac19c791 feat: notok option 其他 2024-08-13 14:47:26 +08:00
caoqianming 562372b0b9 feat: mlog添加不合格项目 2024-08-12 11:07:29 +08:00
caoqianming 1a42cf34f0 feat: wmaterial增加count_xtest/handover增加检验交接 2024-08-09 15:09:26 +08:00
caoqianming 42c1386efd feat: sflogexp增加返回信息 2024-08-06 08:29:21 +08:00
caoqianming 071558af8d feat: mlogbin 校验记录已存在 2024-08-01 17:32:48 +08:00
caoqianming cbedb81b0e fix: mlogbin 不合格物料校验去除 2024-08-01 16:54:09 +08:00