diff --git a/apps/wpm/views.py b/apps/wpm/views.py index ce525e72..32d9739d 100644 --- a/apps/wpm/views.py +++ b/apps/wpm/views.py @@ -273,6 +273,9 @@ class MlogViewSet(CustomModelViewSet): # data = list(data_dict.values()) if self.request.query_params.get('with_wpr', False) == 'yes': pass + # wpr_dict = {item["id"]: None for item in data} + # wpr_out_qs = Mlogbw.objects.filter(mlogb__mlog__id__in=wpr_dict.keys(), + # mlogb__material_out__isnull=False).values_list('mlogb__mlog', 'number') return data @lock_model_record_d_method(Mlog) @@ -872,7 +875,7 @@ class MlogbInViewSet(CreateModelMixin, UpdateModelMixin, DestroyModelMixin, Cust c_month = handle_date.month m_model = material_out.model # 按生产日志查询 - wpr = Wpr.objects.filter(wpr_mlogbw__mlogb__material_out=material_out, + wpr = Wpr.objects.filter(wpr_mlogbw__mlogb__mlog__mgroup=mlog.mgroup, wpr_mlogbw__mlogb__mlog__is_fix=False, wpr_mlogbw__mlogb__mlog__submit_time__isnull=False, wpr_mlogbw__mlogb__mlog__handle_date__year=c_year, wpr_mlogbw__mlogb__mlog__handle_date__month=c_month).order_by("number").last()