Commit Graph

358 Commits

Author SHA1 Message Date
caoqianming 89aca50f44 fix: 正常交接收料工段与送料工段不能相同 2025-07-03 11:36:18 +08:00
caoqianming 1a621aca34 feat: 生产日志返回提交人姓名 2025-07-02 16:41:54 +08:00
caoqianming 1d840e7c9d feat: 正常交接收料工段与送料工段不能相同 2025-07-02 10:46:11 +08:00
caoqianming 620e547da5 feat: 单日志支持多工艺步骤 2025-06-30 16:17:09 +08:00
caoqianming 6af708d4f0 feat: wmaterial添加can_handover字段 2025-06-18 10:31:35 +08:00
caoqianming 8d6f2bfd20 fix: mlogbinupdate时的bug 2025-06-17 08:36:48 +08:00
caoqianming 1366f432ee feat: mlogbin的编辑与mlogbout的联动 2025-06-16 17:42:43 +08:00
caoqianming ab0c962053 feat: mlogbin联动mlogbout 2025-06-13 16:22:50 +08:00
caoqianming 4bd6eab9f4 feat: mlogbin 和 update时cal_count_notok cal_mlog传False 2025-06-13 15:56:43 +08:00
caoqianming b9a7138e72 feat: mlogbin 和 update时cal_count_notok 2025-06-13 15:24:53 +08:00
caoqianming 680608e16f fix: mlogserializer需要同步count_real 2025-06-13 14:29:31 +08:00
caoqianming 6d87a69d8d fix: cal_mlog_count_from_mlogb 需要传参触发 2025-06-13 11:23:02 +08:00
caoqianming c02bb6d3db fix: mlog 数值计算bug 2025-06-13 09:03:43 +08:00
caoqianming dbad152218 fix: wmaterial get在传入query参数时完善can_do的逻辑 2025-06-12 10:37:19 +08:00
caoqianming 519672ef3f fix: mlog 的cal_count_notok_full的bug 3 2025-06-06 16:50:24 +08:00
caoqianming fa221218f9 feat: cal_count_notok 完全合格数有bug 2025-06-06 15:58:33 +08:00
caoqianming f41068e923 feat: handover根据wm完善batch字段 2025-05-26 12:10:47 +08:00
caoqianming 8a7c3830c9 feat: 各工段批次生产进度统计 2025-05-22 13:31:41 +08:00
caoqianming 126ef8a1b8 feat: mloginit支持handle_users 2025-05-20 08:41:59 +08:00
caoqianming cbeecea2dc fix: need_inout 传true时也得处理 2025-05-15 14:49:40 +08:00
caoqianming e59c83aa3f feat: 支持个号转批号6 2025-04-28 15:59:29 +08:00
caoqianming 8697288d69 feat: mlogbwcreate校验增加wm所属 2025-04-27 12:17:13 +08:00
caoqianming d6fe5af39c feat: 单填写mlog支持返工 2025-04-25 15:24:38 +08:00
caoqianming 6033216869 fix: mloginit在返工时不接收route 2025-04-25 14:21:24 +08:00
caoqianming 439bfeb7d6 fix: 返工校验输入物料选择错误 2025-04-25 11:27:14 +08:00
caoqianming 84380931fd fix: 完善负数校验2 2025-04-24 16:12:38 +08:00
caoqianming ca7d56a462 fix: 完善负数校验 2025-04-24 16:07:55 +08:00
caoqianming 9df6294617 feat: mlogbupdate支持变更批号 2025-04-24 13:44:30 +08:00
caoqianming 1cb4128be2 fix: mlogbupdate时attrs遍历时修改的bug 2025-04-24 13:36:18 +08:00
caoqianming c2539185e2 feat: mlog增加team字段 2025-04-22 15:49:42 +08:00
caoqianming 3811c055f9 feat: mlog的need_inout逻辑 2025-04-22 15:27:02 +08:00
caoqianming ea00a38406 feat: mlogb返回test_user_name 2025-04-22 10:16:10 +08:00
caoqianming 42c249330e fix: mlogbin解决负值校验存在的bug 2025-04-22 09:14:11 +08:00
caoqianming ced7515d80 feat: 日志完善负值校验 2025-04-21 15:43:54 +08:00
caoqianming 9e4e5a28c6 fix:: 交接记录提交时校验count>0 2025-04-19 21:11:45 +08:00
caoqianming b44fec0695 feat: 合并的交接需要校验物料是否一致 2025-04-17 14:05:56 +08:00
caoqianming 6d904341a0 feat: 交接需要校验物料是否一致 2025-04-17 13:30:30 +08:00
caoqianming fafe39c1bd fix: 存在fmlog时将route带给mlog并进行物料校验 2025-04-17 11:16:40 +08:00
caoqianming 5f2385ccd1 fix: fmlog填写mtask或route即可 2025-04-17 09:06:34 +08:00
caoqianming 896be043f5 feat: 返工可选择不合格品/根据工艺路线决定返工后是合格不合格还是返修完成 2025-04-16 19:14:18 +08:00
caoqianming b5c21b7472 feat: fmlog添加工艺步骤字段及相应返回数据 2025-04-16 17:59:20 +08:00
caoqianming 300023ff81 fix: 交接分批bug/加工前不良的bug 2025-04-16 13:43:38 +08:00
caoqianming e0217e86c4 feat: 添加count_json_from字段及相应逻辑 2025-04-16 11:31:23 +08:00
caoqianming c670bd69e1 feat: fmlog添加is_fix字段校验 2025-04-15 10:30:02 +08:00
caoqianming 88bf75baaf feat: fmlog添加is_fix字段 2025-04-14 22:49:31 +08:00
caoqianming 1cbbade280 feat: 单个日志填写时带入wm_in的batch 2025-04-14 22:26:42 +08:00
caoqianming c791bde5be fix: handover拆批请选择车间库存2 2025-04-14 15:29:36 +08:00
caoqianming 88da422f54 feat: mlogchangeserializer增加生产设备选择 2025-03-31 13:36:25 +08:00
caoqianming 4e7757f64d feat: 合批时的物料校验 2025-03-26 13:30:39 +08:00
caoqianming 0ddc6692ac feat: handover 合并可指定现有库存 2025-03-26 13:19:30 +08:00
caoqianming 546b020dae feat: mloguserserializer handle_user_name 2025-03-25 14:59:01 +08:00
caoqianming 6f28056ed4 feat: 重构以下batchlog 2025-03-25 09:44:22 +08:00
caoqianming e07f9c877c feat: 添加mloguser字段及逻辑 2025-03-24 14:37:18 +08:00
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