From d483bb6b61b01ae88665a393e68df344eb6fb884 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Sun, 28 Jan 2024 00:18:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20mlog=20update=E6=97=B6mlogb=E4=B8=8D?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/wpm/serializers.py | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/apps/wpm/serializers.py b/apps/wpm/serializers.py
index 925f87ff..a4293441 100644
--- a/apps/wpm/serializers.py
+++ b/apps/wpm/serializers.py
@@ -271,20 +271,10 @@ class MlogSerializer(CustomModelSerializer):
         with transaction.atomic():
             mlogb = validated_data.pop('mlogb', [])
             instance = super().update(instance, validated_data)
-            brotherId_should_list = instance.material_out.brothers
-            if brotherId_should_list:
-                if mlogb:
-                    for item in mlogb:
-                        id = item.get('id', None)
-                        if id:
-                            mlogb = Mlogb.objects.get(id=id)
-                            mlogb.count_ok = item['count_ok']
-                            mlogb.save()
-                        # elif item['material_out'].id in brotherId_should_list:
-                        #     Mlogb.objects.create(
-                        #         mlog=instance, material_out=item['material_out'], count_ok=item['count_ok'])
-                else:
-                    raise ValidationError('缺少产出物信息')
+            if mlogb:
+                Mlogb.objects.filter(mlog=instance).update(count_ok=0)
+                for item in mlogb:
+                    Mlogb.objects.filter(mlog=instance, material_out=item['material_out']).update(count_ok=item['count_ok'])
         return instance
 
     def validate(self, attrs):

From 51893d23e0c135036374dfc760a6c0b7536f4ebe Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Sun, 28 Jan 2024 00:20:17 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E5=8E=BB=E9=99=A4=E4=B8=8D=E5=BF=85?=
 =?UTF-8?q?=E8=A6=81=E7=9A=84print?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/utils/tools.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/utils/tools.py b/apps/utils/tools.py
index 648bc603..6f36bc67 100755
--- a/apps/utils/tools.py
+++ b/apps/utils/tools.py
@@ -232,7 +232,6 @@ def compare_lists_of_dicts(list1, list2, ignore_order=False):
 
 def compare_values(val1, val2, ignore_order=False):
     """通用比较函数，也可以处理字典和列表。"""
-    print(val1, val2)
     if isinstance(val1, list) and isinstance(val2, list):
         # 假设这里我们关心列表中对象的顺序
         return compare_lists_of_dicts(val1, val2, ignore_order)