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

feat: mlogbout url register

This commit is contained in:
caoqianming 2024-07-11 17:44:18 +08:00
parent d38e91667e
commit 4934327808
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/wpm/serializers.py
View File

@ -395,7 +395,8 @@ class MlogbOutUpdateSerializer(CustomModelSerializer):
class Meta: class Meta:
model = Mlogb model = Mlogb
fields = ['id', 'batch', 'count_real', 'count_ok', 'count_notok', fields = ['id', 'batch', 'count_real', 'count_ok', 'count_notok',
'count_n_hs'] 'count_n_hs', 'count_n_qp', 'count_n_swen', 'count_n_bb',
'count_n_wm', 'count_n_md', 'count_n_xh']
class MlogRevertSerializer(serializers.Serializer): class MlogRevertSerializer(serializers.Serializer):
change_reason = serializers.CharField(label='撤回原因') change_reason = serializers.CharField(label='撤回原因')

3
apps/wpm/urls.py
View File

@ -3,7 +3,7 @@ from rest_framework.routers import DefaultRouter
from apps.wpm.views import (SfLogViewSet, StLogViewSet, SfLogExpViewSet, from apps.wpm.views import (SfLogViewSet, StLogViewSet, SfLogExpViewSet,
WMaterialViewSet, MlogViewSet, HandoverViewSet, WMaterialViewSet, MlogViewSet, HandoverViewSet,
AttlogViewSet, OtherLogViewSet, MlogbViewSet, MlogbInViewSet) AttlogViewSet, OtherLogViewSet, MlogbViewSet, MlogbInViewSet, MlogbOutViewSet)
API_BASE_URL = 'api/wpm/' API_BASE_URL = 'api/wpm/'
@ -17,6 +17,7 @@ router.register('wmaterial', WMaterialViewSet, basename='wmaterial')
router.register('mlog', MlogViewSet, basename='mlog') router.register('mlog', MlogViewSet, basename='mlog')
router.register('mlogb', MlogbViewSet) router.register('mlogb', MlogbViewSet)
router.register('mlogb/in', MlogbInViewSet) router.register('mlogb/in', MlogbInViewSet)
router.register('mlogb/out', MlogbOutViewSet)
router.register('handover', HandoverViewSet, basename='handover') router.register('handover', HandoverViewSet, basename='handover')
router.register('attlog', AttlogViewSet, basename='attlog') router.register('attlog', AttlogViewSet, basename='attlog')
router.register('otherlog', OtherLogViewSet, basename='otherlog') router.register('otherlog', OtherLogViewSet, basename='otherlog')

11
apps/wpm/views.py
View File

@ -21,7 +21,7 @@ from .serializers import (SflogExpSerializer, SfLogSerializer, StLogSerializer,
MlogSerializer, MlogRelatedSerializer, DeptBatchSerializer, HandoverSerializer, MlogSerializer, MlogRelatedSerializer, DeptBatchSerializer, HandoverSerializer,
GenHandoverSerializer, GenHandoverWmSerializer, MlogAnaSerializer, GenHandoverSerializer, GenHandoverWmSerializer, MlogAnaSerializer,
AttLogSerializer, OtherLogSerializer, MlogInitSerializer, MlogChangeSerializer, AttLogSerializer, OtherLogSerializer, MlogInitSerializer, MlogChangeSerializer,
MlogbDetailSerializer, MlogbInSerializer, MlogbInUpdateSerializer) MlogbDetailSerializer, MlogbInSerializer, MlogbInUpdateSerializer, MlogbOutUpdateSerializer)
from .services import mlog_submit, update_mtask, handover_submit, mlog_revert, cal_material_count_from_mlog, cal_mtask_progress_from_mlog from .services import mlog_submit, update_mtask, handover_submit, mlog_revert, cal_material_count_from_mlog, cal_mtask_progress_from_mlog
from apps.utils.thread import MyThread from apps.utils.thread import MyThread
from apps.monitor.services import create_auditlog, delete_auditlog from apps.monitor.services import create_auditlog, delete_auditlog
@ -175,7 +175,7 @@ class MlogViewSet(CustomModelViewSet):
初始化日志 初始化日志
""" """
sr = MlogInitSerializer(data=request.data) sr = self.get_serializer(data=request.data)
sr.is_valid(raise_exception=True) sr.is_valid(raise_exception=True)
ins = sr.save() ins = sr.save()
return Response(MlogSerializer(ins).data) return Response(MlogSerializer(ins).data)
@ -445,7 +445,7 @@ class MlogbViewSet(ListModelMixin, CustomGenericViewSet):
class MlogbInViewSet(CreateModelMixin, UpdateModelMixin, DestroyModelMixin, CustomGenericViewSet): class MlogbInViewSet(CreateModelMixin, UpdateModelMixin, DestroyModelMixin, CustomGenericViewSet):
perms_map = {'post': 'mlog.update', 'delete': 'mlog.update'} perms_map = {'post': 'mlog.update', 'delete': 'mlog.update'}
queryset = Mlogb.objects.all() queryset = Mlogb.objects.filter(material_in__isnull=False)
serializer_class = MlogbInSerializer serializer_class = MlogbInSerializer
update_serializer_class = MlogbInUpdateSerializer update_serializer_class = MlogbInUpdateSerializer
@ -479,3 +479,8 @@ class MlogbInViewSet(CreateModelMixin, UpdateModelMixin, DestroyModelMixin, Cust
if route.batch_bind: # 批次绑定 if route.batch_bind: # 批次绑定
m_dict['batch'] = ins.batch m_dict['batch'] = ins.batch
Mlogb.objects.get_or_create(**m_dict, defaults=m_dict) Mlogb.objects.get_or_create(**m_dict, defaults=m_dict)
class MlogbOutViewSet(UpdateModelMixin, CustomGenericViewSet):
queryset = Mlogb.objects.filter(material_out__isnull=False)
serializer_class = MlogbOutUpdateSerializer