From 53322ed9ada71bb73a06689719178f83dc496b2b Mon Sep 17 00:00:00 2001 From: caoqianming Date: Sun, 24 Nov 2024 17:22:03 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=85=84=E5=BC=9F=E4=BB=B6=E4=BA=A7?= =?UTF-8?q?=E5=87=BA=E9=9C=80=E8=A6=81=E6=B3=A8=E6=84=8Fbatch=E7=9A=84?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wpm/serializers.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/wpm/serializers.py b/apps/wpm/serializers.py index b595790b..61df3cff 100644 --- a/apps/wpm/serializers.py +++ b/apps/wpm/serializers.py @@ -309,7 +309,6 @@ class MlogSerializer(CustomModelSerializer): batch=instance.batch, mtask=instance.mtask, material_out=item['material_out'], - count_real=item['count_ok'], count_ok=item['count_ok']) if wm_in: mlogbx.batch_ofrom = wm_in.batch_ofrom @@ -379,10 +378,12 @@ class MlogSerializer(CustomModelSerializer): # 修改产出 if instance.fill_way == Mlog.MLOG_2 and instance.material_out.brothers: # 针对兄弟件的情况 - Mlogb.objects.filter(mlog=instance, material_out__isnull=False).update(count_real=0, count_ok=0) + Mlogb.objects.filter(mlog=instance, material_out__isnull=False).update( + batch=instance.batch, # 注意mlog的batch有可能会进行修改 + count_ok=0) for item in mlogb: Mlogb.objects.filter(mlog=instance, material_out=item['material_out']).update( - count_real=item['count_ok'], + batch=instance.batch, count_ok=item['count_ok']) elif instance.fill_way in [Mlog.MLOG_12, Mlog.MLOG_2]: