zcdsj
/
factory
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: wmaterial根据current_merged查询3

This commit is contained in:
caoqianming 2026-01-22 16:12:35 +08:00
parent 63002f27c8
commit a534bde086
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/wpm/filters.py
View File

@ -43,7 +43,7 @@ class WMaterialFilter(filters.FilterSet):
material__process__exclude = filters.CharFilter(field_name="material__process", lookup_expr="exact", exclude=True) 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_start = filters.DateFilter(label="产出开始", method="filter_mlog_date_start")
mlog_date_end = filters.DateFilter(label="产出结束", method="filter_mlog_date_end") 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): def filter_mlog_date_start(self, queryset, name, value):
mgroupId = self.data.get("mgroup", None) 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()) return queryset.filter(material=route.material_in)|queryset.filter(material__in=route.materials.all())
def filter_current_merged(self, queryset, name, value): 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( sub_qs = Handoverb.objects.filter(
wm=OuterRef("pk"), wm_to=OuterRef("pk"),
handover__mtype=Handover.H_MERGE, handover__mtype=Handover.H_MERGE,
handover__recive_mgroup__id=mgroupxId,
handover__submit_time__isnull=False handover__submit_time__isnull=False
) )
if value is True: if value is True: