diff --git a/apps/wpm/scripts/batch_bxerp.py b/apps/wpm/scripts/batch_bxerp.py index 80d14191..d16dc40a 100644 --- a/apps/wpm/scripts/batch_bxerp.py +++ b/apps/wpm/scripts/batch_bxerp.py @@ -1,6 +1,6 @@ from apps.wpm.models import BatchSt import logging -from apps.wpm.models import Mlogb, MlogbDefect +from apps.wpm.models import Mlogb, Mlogbw, MlogbDefect from apps.mtm.models import Mgroup import decimal from django.db.models import Sum @@ -41,10 +41,14 @@ def main(batch: str, mgroup_obj:Mgroup=None): for item in mlogb1_qs: # 找到对应的输入 mlogb_from:Mlogb = item.mlogb_from + mlogbw_from:Mlogbw = item.mlogbw_from if mlogb_from: mlogb_q_ids.append(mlogb_from.id) data[f"{mgroup_name}_count_use"] += mlogb_from.count_use 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: data[f"{mgroup_name}_操作人"].append(item.mlog.handle_user) if item.mlog.handle_date: