feat: wmaterial根据current_merged查询3

apps/wpm/filters.py

@@ -43,7 +43,7 @@ class WMaterialFilter(filters.FilterSet):
     material__process__exclude = filters.CharFilter(field_name="material__process", lookup_expr="exact", exclude=True)
     mlog_date_start = filters.DateFilter(label="产出开始", method="filter_mlog_date_start")
     mlog_date_end = filters.DateFilter(label="产出结束", method="filter_mlog_date_end")
-    current_merged = filters.BooleanFilter(label="是否在本工段合批", method="filter_current_merged")
+    current_merged = filters.BooleanFilter(label="是否本工段新合成的批", method="filter_current_merged")
 
     def filter_mlog_date_start(self, queryset, name, value):
         mgroupId = self.data.get("mgroup", None)
@@ -103,15 +103,9 @@ class WMaterialFilter(filters.FilterSet):
         return queryset.filter(material=route.material_in)|queryset.filter(material__in=route.materials.all())
     
     def filter_current_merged(self, queryset, name, value):
-        mgroupxId = self.data.get("mgroupx", None)
-        if mgroupxId:
-            pass
-        else:
-            raise ParseError("请提供工段查询条件")
         sub_qs = Handoverb.objects.filter(
-            wm=OuterRef("pk"),
+            wm_to=OuterRef("pk"),
             handover__mtype=Handover.H_MERGE,
-            handover__recive_mgroup__id=mgroupxId,
             handover__submit_time__isnull=False
         )
         if value is True: