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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
caoqianming 2025-01-09 14:17:07 +08:00
parent 5b0063e42d 4a3934b4fd
commit 180724bee5
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
apps/wpm/views.py
View File

@ -31,6 +31,7 @@ from apps.wpm.services import mlog_submit_validate, generate_new_batch
from apps.wf.models import State from apps.wf.models import State
from apps.wpmw.models import Wpr from apps.wpmw.models import Wpr
from apps.qm.models import QctMat, Ftest from apps.qm.models import QctMat, Ftest
from apps.enm.models import EnStat
# Create your views here. # Create your views here.
@ -58,7 +59,7 @@ class StLogViewSet(CustomModelViewSet):
return super().destroy(request, *args, **kwargs) return super().destroy(request, *args, **kwargs)
class SfLogViewSet(UpdateModelMixin, ListModelMixin, DestroyModelMixin, CustomGenericViewSet): class SfLogViewSet(UpdateModelMixin, CustomListModelMixin, DestroyModelMixin, CustomGenericViewSet):
""" """
list:值班记录 list:值班记录
@ -72,6 +73,16 @@ class SfLogViewSet(UpdateModelMixin, ListModelMixin, DestroyModelMixin, CustomGe
search_fields = ['note'] search_fields = ['note']
ordering = ['-start_time'] ordering = ['-start_time']
def add_info_for_list(self, data):
sflogs = [i['id'] for i in data]
sflogs_dict = EnStat.objects.filter(sflog_id__in=sflogs).values('sflog_id', 'total_production','qua_data','production_hour','elec_consume_unit','run_rate','production_cost_unit')
# 创建索引
sflogs_dict = {x['sflog_id']: x for x in sflogs_dict}
for item in data:
if item['id'] in sflogs_dict:
item.update({"enstat_info": sflogs_dict[item['id']]})
return data
@action(methods=['get'], detail=True, perms_map={'get': '*'}) @action(methods=['get'], detail=True, perms_map={'get': '*'})
def init_test(self, request, pk=None): def init_test(self, request, pk=None):
""" """
@ -96,8 +107,8 @@ class SfLogViewSet(UpdateModelMixin, ListModelMixin, DestroyModelMixin, CustomGe
'material__sort', 'material__create_time', 'testitem__sort', 'testitem__create_time') 'material__sort', 'material__create_time', 'testitem__sort', 'testitem__create_time')
sr = QuaStatSerializer(instance=qs, many=True) sr = QuaStatSerializer(instance=qs, many=True)
return Response(sr.data) return Response(sr.data)
class SfLogExpViewSet(ListModelMixin, UpdateModelMixin, CustomGenericViewSet): class SfLogExpViewSet(ListModelMixin, UpdateModelMixin, CustomGenericViewSet):
""" """
list:异常值班处理 list:异常值班处理