zcdsj
/
factory
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

perf: 一些调整

This commit is contained in:
caoqianming 2023-11-03 09:07:33 +08:00
parent 07c0bd93f4
commit 9315efe6f4
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/wpm/models.py
View File

@ -145,7 +145,7 @@ class Mlog(CommonADModel):
class Mlogb(BaseModel): class Mlogb(BaseModel):
mlog = models.ForeignKey(Mlog, verbose_name='关联日志', mlog = models.ForeignKey(Mlog, verbose_name='关联日志',
on_delete=models.CASCADE) on_delete=models.CASCADE, related_name='b_mlog')
material_out = models.ForeignKey( material_out = models.ForeignKey(
Material, verbose_name='产物', on_delete=models.CASCADE, related_name='mlogb_material_out') Material, verbose_name='产物', on_delete=models.CASCADE, related_name='mlogb_material_out')
count_ok = models.PositiveIntegerField('合格数量', default=0) count_ok = models.PositiveIntegerField('合格数量', default=0)

5
apps/wpm/views.py
View File

@ -1,4 +1,5 @@
from django.db import transaction from django.db import transaction
from django.db.models import Prefetch
from django.shortcuts import render from django.shortcuts import render
from rest_framework.decorators import action from rest_framework.decorators import action
from rest_framework.exceptions import ParseError from rest_framework.exceptions import ParseError
@ -12,7 +13,7 @@ from apps.utils.viewsets import CustomGenericViewSet, CustomModelViewSet
from apps.utils.mixins import BulkCreateModelMixin from apps.utils.mixins import BulkCreateModelMixin
from .filters import SfLogExpFilter, SfLogFilter, WMaterialFilter, MlogFilter, HandoverFilter from .filters import SfLogExpFilter, SfLogFilter, WMaterialFilter, MlogFilter, HandoverFilter
from .models import SfLog, SfLogExp, StLog, WMaterial, Mlog, Handover from .models import SfLog, SfLogExp, StLog, WMaterial, Mlog, Handover, Mlogb
from .serializers import (SflogExpSerializer, SfLogSerializer, StLogSerializer, WMaterialSerializer, from .serializers import (SflogExpSerializer, SfLogSerializer, StLogSerializer, WMaterialSerializer,
MlogSerializer, MlogRelatedSerializer, DeptBatchSerializer, HandoverSerializer, GenHandoverSerializer, GenHandoverWmSerializer) MlogSerializer, MlogRelatedSerializer, DeptBatchSerializer, HandoverSerializer, GenHandoverSerializer, GenHandoverWmSerializer)
from .services import mlog_submit, update_mtask, handover_submit from .services import mlog_submit, update_mtask, handover_submit
@ -124,7 +125,7 @@ class MlogViewSet(CustomModelViewSet):
serializer_class = MlogSerializer serializer_class = MlogSerializer
select_related_fields = ['create_by', 'update_by', 'mtask', select_related_fields = ['create_by', 'update_by', 'mtask',
'handle_user', 'handle_user_2', 'equipment', 'equipment_2'] 'handle_user', 'handle_user_2', 'equipment', 'equipment_2']
prefetch_related_fields = ['handle_users', 'material_outs'] prefetch_related_fields = ['handle_users', 'material_outs', 'b_mlog']
filterset_class = MlogFilter filterset_class = MlogFilter
def perform_destroy(self, instance): def perform_destroy(self, instance):