diff --git a/apps/wpm/views.py b/apps/wpm/views.py index bce7194a..e37f050f 100644 --- a/apps/wpm/views.py +++ b/apps/wpm/views.py @@ -30,7 +30,9 @@ from .services import mlog_submit, handover_submit, mlog_revert from apps.wpm.services import mlog_submit_validate, generate_new_batch from apps.wf.models import State from apps.wpmw.models import Wpr -from apps.qm.models import QctMat +from apps.qm.models import QctMat, Ftest + + # Create your views here. @@ -481,12 +483,21 @@ class MlogbInViewSet(CreateModelMixin, UpdateModelMixin, DestroyModelMixin, Cust route = ins.mtask.route if route.batch_bind: query_dict["batch__contains"] = ins.batch + qs = Mlogb.objects.filter(**query_dict) + # 需要删除子集ftest记录 + ftestIds = Mlogbw.objects.filter(mlogb__in=qs).values_list("ftest__id", flat=True) + Ftest.objects.filter(id__in=ftestIds).delete() Mlogb.objects.filter(**query_dict).delete() instance.delete() @transaction.atomic def perform_create(self, serializer): mlogbin: Mlogb = serializer.save() + # 找寻质检表 + qctmat0 = QctMat.objects.filter(material=mlogbin.material_in).order_by("-create_time").first() + if qctmat0: + mlogbin.qct = qctmat0 + mlogbin.save() mlog:Mlog = mlogbin.mlog route:Route = mlog.route # 以及mlogbw