fix: mlog 数值计算bug

apps/wpm/models.py

@@ -316,7 +316,7 @@ class Mlog(CommonADModel):
         通过mlogb计算mlog count 合计
         """
         mlog = self
-        if mlog.fill_way == Mlog.MLOG_23:
+        if mlog.fill_way in [Mlog.MLOG_23, Mlog.MLOG_12]:
             a_dict = {
                 "total_count_use": Sum('count_use'),
                 "total_count_break": Sum('count_break'),

apps/wpm/serializers.py

@@ -579,7 +579,10 @@ class MlogSerializer(CustomModelSerializer):
             supplier = attrs.get('supplier', None)
             if not supplier:
                 raise ParseError('外协必须选择外协单位')
+            
         mtask = attrs.get('mtask', None)
+        mlogdefect = attrs.get('mlogdefect', None)
+        if mlogdefect is None:
             count_notok = 0
             for i in attrs:
                 if 'count_n_' in i:
@@ -589,10 +592,8 @@ class MlogSerializer(CustomModelSerializer):
             attrs['count_notok'] = count_notok
         if attrs['count_ok'] < 0:
             raise ParseError('合格数量不能小于0')
-        if attrs['count_real'] >= attrs['count_ok'] + attrs['count_notok']:
-            pass
-        else:
-            raise ParseError('生产数量不能小于合格数量')
+        if attrs['count_real'] != attrs['count_ok'] + attrs['count_notok']:
+            raise ParseError('生产数量需等于合格数量+不合格数量')
         if mtask:
             if mtask.start_date == mtask.end_date:
                 attrs['handle_date'] = mtask.start_date