From f41068e923b983be35cddaff20c783f84cebfab8 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 26 May 2025 12:10:47 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20handover=E6=A0=B9=E6=8D=AEwm=E5=AE=8C?= =?UTF-8?q?=E5=96=84batch=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wpm/serializers.py | 2 ++ apps/wpm/views.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/wpm/serializers.py b/apps/wpm/serializers.py index 9b426aac..19e4c697 100644 --- a/apps/wpm/serializers.py +++ b/apps/wpm/serializers.py @@ -1013,6 +1013,8 @@ class HandoverSerializer(CustomModelSerializer): wm:WMaterial = attrs.get('wm', None) + if wm: + attrs["batch"] = wm.batch handoverb = attrs.get('handoverb', []) if wm and not handoverb: attrs['handoverb'] = [{"wm": wm, "count": attrs["count"] }] diff --git a/apps/wpm/views.py b/apps/wpm/views.py index f8aa07d2..62bfaf53 100644 --- a/apps/wpm/views.py +++ b/apps/wpm/views.py @@ -383,7 +383,7 @@ class HandoverViewSet(CustomModelViewSet): select_related_fields = ['send_user', 'send_mgroup', 'send_dept', 'recive_user', 'recive_mgroup', 'recive_dept', 'wm'] filterset_class = HandoverFilter search_fields = ['id', 'material__name', - 'material__number', 'material__specification', 'batch', 'material__model', 'b_handover__batch', "new_batch"] + 'material__number', 'material__specification', 'batch', 'material__model', 'b_handover__batch', "new_batch", "wm__batch"] prefetch_related_fields = ["b_handover"] def perform_destroy(self, instance):