From e491d7b4fefb1159e9413eb37c9d545061a5971b Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 10 Sep 2025 15:35:17 +0800 Subject: [PATCH 1/4] fix: wpr list filter bug --- apps/wpmw/filters.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/wpmw/filters.py b/apps/wpmw/filters.py index 607fc49c..fae8b731 100644 --- a/apps/wpmw/filters.py +++ b/apps/wpmw/filters.py @@ -38,9 +38,11 @@ class WprFilter(filters.FilterSet): elif value == "done": matoutIds = process.get_canout_mat_ids() qs = queryset.filter(material__id__in=matoutIds).exclude(state=WMaterial.WM_REPAIR)|queryset.filter(state=WMaterial.WM_REPAIRED, wm__mgroup__id=mgroupId) + return qs elif value == "canfix": matoutIds = process.get_canout_mat_ids() qs = queryset.filter(state=WMaterial.WM_REPAIR, wm__mgroup__id=mgroupId)| queryset.filter(material__id__in=matoutIds, state=WMaterial.WM_NOTOK) + return qs else: raise ParseError("请提供工段查询条件") From 53858cac942f04207af1987d3d822cf4fb14271e Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 10 Sep 2025 17:01:53 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20wpr=20list=20=E8=BF=94=E5=9B=9Emate?= =?UTF-8?q?rial=5Fstart=5Fname?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wpmw/serializers.py | 1 + apps/wpmw/views.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/wpmw/serializers.py b/apps/wpmw/serializers.py index 421d79d2..d1766cf4 100644 --- a/apps/wpmw/serializers.py +++ b/apps/wpmw/serializers.py @@ -17,6 +17,7 @@ class WprSerializer(CustomModelSerializer): mb_batch = serializers.CharField(source="mb.batch", read_only=True) material_name = serializers.StringRelatedField( source='material', read_only=True) + material_start_name = serializers.StringRelatedField(source='material_start', read_only=True) wprdefect = WprDefectSerializer(many=True, read_only=True) class Meta: diff --git a/apps/wpmw/views.py b/apps/wpmw/views.py index ea8ad8e2..cc5a2f2d 100644 --- a/apps/wpmw/views.py +++ b/apps/wpmw/views.py @@ -18,7 +18,7 @@ class WprViewSet(CustomListModelMixin, RetrieveModelMixin, ComplexQueryMixin, Cu 动态产品 """ perms_map = {"get": "*"} - select_related_fields = ["wm", "mb", "material"] + select_related_fields = ["wm", "mb", "material", "material_start"] prefetch_related_fields = ["defects"] queryset = Wpr.objects.all() serializer_class = WprSerializer From e4a2e7c4f57f06d99b59b9cccfa12b7d8bd29101 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 11 Sep 2025 09:08:48 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=20wpr=20list=20=E8=BF=94=E5=9B=9Ewm?= =?UTF-8?q?=5Fmaterial=5Fname?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wpmw/serializers.py | 3 ++- apps/wpmw/views.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/wpmw/serializers.py b/apps/wpmw/serializers.py index d1766cf4..0905dc6c 100644 --- a/apps/wpmw/serializers.py +++ b/apps/wpmw/serializers.py @@ -17,7 +17,8 @@ class WprSerializer(CustomModelSerializer): mb_batch = serializers.CharField(source="mb.batch", read_only=True) material_name = serializers.StringRelatedField( source='material', read_only=True) - material_start_name = serializers.StringRelatedField(source='material_start', read_only=True) + # material_start_name = serializers.StringRelatedField(source='material_start', read_only=True) + wm_material_name = serializers.StringRelatedField(source="wm.material", read_only=True) wprdefect = WprDefectSerializer(many=True, read_only=True) class Meta: diff --git a/apps/wpmw/views.py b/apps/wpmw/views.py index cc5a2f2d..1394d321 100644 --- a/apps/wpmw/views.py +++ b/apps/wpmw/views.py @@ -18,7 +18,7 @@ class WprViewSet(CustomListModelMixin, RetrieveModelMixin, ComplexQueryMixin, Cu 动态产品 """ perms_map = {"get": "*"} - select_related_fields = ["wm", "mb", "material", "material_start"] + select_related_fields = ["wm", "mb", "material", "wm__material"] prefetch_related_fields = ["defects"] queryset = Wpr.objects.all() serializer_class = WprSerializer From d828bb76d51c7ce98f320ed42a48f9c7f74e2e79 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 11 Sep 2025 09:13:37 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat:=20wpr=20list=20=E8=BF=94=E5=9B=9Ewm?= =?UTF-8?q?=5Fmaterial=5Fofrom=5Fname?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wpmw/serializers.py | 2 +- apps/wpmw/views.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/wpmw/serializers.py b/apps/wpmw/serializers.py index 0905dc6c..860dbbba 100644 --- a/apps/wpmw/serializers.py +++ b/apps/wpmw/serializers.py @@ -18,7 +18,7 @@ class WprSerializer(CustomModelSerializer): material_name = serializers.StringRelatedField( source='material', read_only=True) # material_start_name = serializers.StringRelatedField(source='material_start', read_only=True) - wm_material_name = serializers.StringRelatedField(source="wm.material", read_only=True) + wm_material_ofrom_name = serializers.StringRelatedField(source="wm.material_ofrom", read_only=True) wprdefect = WprDefectSerializer(many=True, read_only=True) class Meta: diff --git a/apps/wpmw/views.py b/apps/wpmw/views.py index 1394d321..149d1759 100644 --- a/apps/wpmw/views.py +++ b/apps/wpmw/views.py @@ -18,7 +18,7 @@ class WprViewSet(CustomListModelMixin, RetrieveModelMixin, ComplexQueryMixin, Cu 动态产品 """ perms_map = {"get": "*"} - select_related_fields = ["wm", "mb", "material", "wm__material"] + select_related_fields = ["wm", "mb", "material", "wm__material_ofrom"] prefetch_related_fields = ["defects"] queryset = Wpr.objects.all() serializer_class = WprSerializer