feat: batch_bxerp考虑mlogbw_from

This commit is contained in:
caoqianming 2025-09-04 08:54:21 +08:00
parent cc45163775
commit abd1ac9d56
1 changed files with 5 additions and 1 deletions

View File

@ -1,6 +1,6 @@
from apps.wpm.models import BatchSt from apps.wpm.models import BatchSt
import logging import logging
from apps.wpm.models import Mlogb, MlogbDefect from apps.wpm.models import Mlogb, Mlogbw, MlogbDefect
from apps.mtm.models import Mgroup from apps.mtm.models import Mgroup
import decimal import decimal
from django.db.models import Sum from django.db.models import Sum
@ -41,10 +41,14 @@ def main(batch: str, mgroup_obj:Mgroup=None):
for item in mlogb1_qs: for item in mlogb1_qs:
# 找到对应的输入 # 找到对应的输入
mlogb_from:Mlogb = item.mlogb_from mlogb_from:Mlogb = item.mlogb_from
mlogbw_from:Mlogbw = item.mlogbw_from
if mlogb_from: if mlogb_from:
mlogb_q_ids.append(mlogb_from.id) mlogb_q_ids.append(mlogb_from.id)
data[f"{mgroup_name}_count_use"] += mlogb_from.count_use data[f"{mgroup_name}_count_use"] += mlogb_from.count_use
data[f"{mgroup_name}_count_pn_jgqbl"] += mlogb_from.count_pn_jgqbl data[f"{mgroup_name}_count_pn_jgqbl"] += mlogb_from.count_pn_jgqbl
if mlogbw_from:
data[f"{mgroup_name}_count_use"] += 1
data[f"{mgroup_name}_count_pn_jgqbl"] += 0
if item.mlog.handle_user: if item.mlog.handle_user:
data[f"{mgroup_name}_操作人"].append(item.mlog.handle_user) data[f"{mgroup_name}_操作人"].append(item.mlog.handle_user)
if item.mlog.handle_date: if item.mlog.handle_date: