From 4934327808fed5406ebaf77b6d15a7e620c7a2ce Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 11 Jul 2024 17:44:18 +0800
Subject: [PATCH] feat: mlogbout url register

---
 apps/wpm/serializers.py |  3 ++-
 apps/wpm/urls.py        |  3 ++-
 apps/wpm/views.py       | 11 ++++++++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/apps/wpm/serializers.py b/apps/wpm/serializers.py
index f68504cc..f81f33ef 100644
--- a/apps/wpm/serializers.py
+++ b/apps/wpm/serializers.py
@@ -395,7 +395,8 @@ class MlogbOutUpdateSerializer(CustomModelSerializer):
     class Meta:
         model = Mlogb
         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):
     change_reason = serializers.CharField(label='撤回原因')
diff --git a/apps/wpm/urls.py b/apps/wpm/urls.py
index 8b00048a..005f4377 100644
--- a/apps/wpm/urls.py
+++ b/apps/wpm/urls.py
@@ -3,7 +3,7 @@ from rest_framework.routers import DefaultRouter
 
 from apps.wpm.views import (SfLogViewSet, StLogViewSet, SfLogExpViewSet, 
                             WMaterialViewSet, MlogViewSet, HandoverViewSet, 
-                            AttlogViewSet, OtherLogViewSet, MlogbViewSet, MlogbInViewSet)
+                            AttlogViewSet, OtherLogViewSet, MlogbViewSet, MlogbInViewSet, MlogbOutViewSet)
 
 
 API_BASE_URL = 'api/wpm/'
@@ -17,6 +17,7 @@ router.register('wmaterial', WMaterialViewSet, basename='wmaterial')
 router.register('mlog', MlogViewSet, basename='mlog')
 router.register('mlogb', MlogbViewSet)
 router.register('mlogb/in', MlogbInViewSet)
+router.register('mlogb/out', MlogbOutViewSet)
 router.register('handover', HandoverViewSet, basename='handover')
 router.register('attlog', AttlogViewSet, basename='attlog')
 router.register('otherlog', OtherLogViewSet, basename='otherlog')
diff --git a/apps/wpm/views.py b/apps/wpm/views.py
index 891de0f9..83751182 100644
--- a/apps/wpm/views.py
+++ b/apps/wpm/views.py
@@ -21,7 +21,7 @@ from .serializers import (SflogExpSerializer, SfLogSerializer, StLogSerializer,
                           MlogSerializer, MlogRelatedSerializer, DeptBatchSerializer, HandoverSerializer,
                           GenHandoverSerializer, GenHandoverWmSerializer, MlogAnaSerializer, 
                           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 apps.utils.thread import MyThread
 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)
         ins = sr.save()
         return Response(MlogSerializer(ins).data)
@@ -445,7 +445,7 @@ class MlogbViewSet(ListModelMixin, CustomGenericViewSet):
 
 class MlogbInViewSet(CreateModelMixin, UpdateModelMixin, DestroyModelMixin, CustomGenericViewSet):
     perms_map = {'post': 'mlog.update', 'delete': 'mlog.update'}
-    queryset = Mlogb.objects.all()
+    queryset = Mlogb.objects.filter(material_in__isnull=False)
     serializer_class = MlogbInSerializer
     update_serializer_class = MlogbInUpdateSerializer
 
@@ -479,3 +479,8 @@ class MlogbInViewSet(CreateModelMixin, UpdateModelMixin, DestroyModelMixin, Cust
             if route.batch_bind:  # 批次绑定
                 m_dict['batch'] = ins.batch
             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
\ No newline at end of file