From 3c6aa3ea18748da6886e9a6add885c5b709353d4 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 9 Jan 2025 10:12:01 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8E=BB=E9=99=A4mlogbdefects2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/wpm/models.py      |  7 -------
 apps/wpm/serializers.py | 15 +--------------
 apps/wpm/views.py       | 25 -------------------------
 3 files changed, 1 insertion(+), 46 deletions(-)

diff --git a/apps/wpm/models.py b/apps/wpm/models.py
index a7eaf988..f95d8123 100644
--- a/apps/wpm/models.py
+++ b/apps/wpm/models.py
@@ -344,19 +344,12 @@ class Mlogb(BaseModel):
     count_n_zt = models.PositiveIntegerField('炸头', default=0)
     count_n_qt = models.PositiveIntegerField('其他', default=0)
     count_notok_json = models.JSONField('不合格情况', default=list, blank=True)
-    # defects = models.ManyToManyField("qm.defect", verbose_name='不合格缺陷',
-    #                                  through="wpm.mlogbdefect", blank=True)
     def get_tracking(self):
         if self.material_in:
             return "in", self.material_in.tracking
         elif self.material_out:
             return "out", self.material_out.tracking
 
-# class MlogbDefect(BaseModel):
-#     mlogb = models.ForeignKey(Mlogb, verbose_name='关联记录', on_delete=models.CASCADE)
-#     defect = models.ForeignKey("qm.defect", verbose_name='缺陷', on_delete=models.CASCADE)
-#     count = models.PositiveIntegerField('数量', default=0)
-
 class Mlogbw(BaseModel):
     number = models.TextField('单个编号')
     mlogb = models.ForeignKey(Mlogb, verbose_name='生产记录', on_delete=models.CASCADE)
diff --git a/apps/wpm/serializers.py b/apps/wpm/serializers.py
index 12c0317e..f5561304 100644
--- a/apps/wpm/serializers.py
+++ b/apps/wpm/serializers.py
@@ -6,7 +6,7 @@ from datetime import datetime
 
 from .models import (SfLog, StLog, SfLogExp, WMaterial, Mlog, 
                     Handover, Handoverb, Mlogb, AttLog,
-                     OtherLog, Fmlog, BatchSt, Mlogbw, Handoverbw, MlogbDefect)
+                     OtherLog, Fmlog, BatchSt, Mlogbw, Handoverbw)
 from apps.system.models import Dept, User
 from apps.system.serializers import UserSimpleSerializer
 from apps.pm.models import Mtask, Mtaskb
@@ -908,16 +908,3 @@ class BatchStSerializer(CustomModelSerializer):
         model = BatchSt
         fields = "__all__"
 
-# class MlogbDefectSerializer(CustomModelSerializer):
-#     defect_name = serializers.CharField(source='defect.name', read_only=True)
-#     class Meta:
-#         model = MlogbDefect
-#         fields = "__all__"
-#         read_only_fields = EXCLUDE_FIELDS_BASE
-#
-#     def create(self, validated_data):
-#         defect = validated_data["defect"]
-#         mlogb = validated_data["mlogb"]
-#         if MlogbDefect.objects.filter(mlogb=mlogb, defect=defect).exists():
-#             raise ParseError('该缺陷已填写')
-#         return super().create(validated_data)
\ No newline at end of file
diff --git a/apps/wpm/views.py b/apps/wpm/views.py
index 136ca498..fbd1ccb6 100644
--- a/apps/wpm/views.py
+++ b/apps/wpm/views.py
@@ -647,28 +647,3 @@ class MlogbwViewSet(CustomModelViewSet):
                     mbw.ftest.delete()
                 mbw.delete()
                 self.cal_mlogb_count(mlogb_to)
-
-
-# class MlogbDefectViewSet(CustomListModelMixin, BulkCreateModelMixin,
-#                          BulkDestroyModelMixin, CustomGenericViewSet):
-#     perms_map = {"get": "*", "post": "mlog.update", "delete": "mlog.update"}
-#     queryset = MlogbDefect.objects.all()
-#     serializer_class = MlogbDefectSerializer
-#     filterset_fields = ["mlogb", "defect"]
-#     ordering = ["create_time"]
-#
-#     def filter_queryset(self, queryset):
-#         if not self.detail and not self.request.query_params.get('mlogb', None):
-#             raise ParseError('请指定所属日志明细')
-#         return super().filter_queryset(queryset)
-#
-#     @transaction.atomic
-#     def perform_create(self, serializer):
-#         ins:MlogbDefect = serializer.save()
-#         ins.mlogb.cal_count()
-#
-#     @transaction.atomic
-#     def perform_destroy(self, instance):
-#         mlogb = instance.mlogb
-#         instance.delete()
-        mlogb.cal_count()
\ No newline at end of file