From 8859c13edf5ce29d979eb3d498b5f1772ca7bbd3 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 16 Mar 2022 16:34:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0to=5Forder=5Fneed=5Fmtest?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hb_server/apps/inm/filters.py | 3 ++- hb_server/apps/wpm/filters.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hb_server/apps/inm/filters.py b/hb_server/apps/inm/filters.py index 377cb4d..1c44ab5 100644 --- a/hb_server/apps/inm/filters.py +++ b/hb_server/apps/inm/filters.py @@ -23,10 +23,11 @@ class MbFilterSet(DynamicFieldsFilterMixin, filters.FilterSet): class IProductFilterSet(DynamicFieldsFilterMixin, filters.FilterSet): order = filters.NumberFilter(field_name="wproduct__subproduction_plan__production_plan__order") to_order = filters.NumberFilter(field_name="wproduct__to_order") + to_order_need_mtest = filters.BooleanFilter(field_name="wproduct__to_order__need_mtest") need_to_order = filters.BooleanFilter(field_name="wproduct__need_to_order") update_time_start = filters.DateFilter(field_name="update_time", lookup_expr='gte') update_time_end = filters.DateFilter(field_name="update_time", lookup_expr='lte') class Meta: model = IProduct fields = ['material', 'warehouse', 'batch', 'order', 'material__type', 'update_time_start', 'update_time_end', - 'to_order', 'need_to_order', 'state'] + 'to_order', 'need_to_order', 'state', 'to_order_need_mtest'] diff --git a/hb_server/apps/wpm/filters.py b/hb_server/apps/wpm/filters.py index 2798e98..2ef5b25 100644 --- a/hb_server/apps/wpm/filters.py +++ b/hb_server/apps/wpm/filters.py @@ -33,6 +33,7 @@ class WProductFilterSet(DynamicFieldsFilterMixin, filters.FilterSet): tag = filters.CharFilter(method='filter_tag') production_plan = filters.NumberFilter( field_name='subproduction_plan__production_plan') + to_order_need_mtest = filters.BooleanFilter(field_name="to_order__need_mtest") def filter_fields(self, queryset, name, value): return queryset @@ -41,7 +42,7 @@ class WProductFilterSet(DynamicFieldsFilterMixin, filters.FilterSet): class Meta: model = WProduct fields = ['step', 'subproduction_plan', 'material', - 'step__process', 'act_state', 'material__type', 'need_to_order'] + 'step__process', 'act_state', 'material__type', 'need_to_order', 'to_order_need_mtest'] def filter_tag(self, queryset, name, value): if value == 'no_scrap':