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

feat: 来料未完成的筛选控制物料类型为半成品、成品

This commit is contained in:
caoqianming 2025-07-30 13:27:35 +08:00
parent c98ce36c16
commit b5889374eb
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/wpm/filters.py
View File

@ -1,7 +1,7 @@
from django_filters import rest_framework as filters from django_filters import rest_framework as filters
from apps.wpm.models import (SfLog, StLog, WMaterial, Mlog, Mlogbw, from apps.wpm.models import (SfLog, StLog, WMaterial, Mlog, Mlogbw,
Handover, Mgroup, Mlogb, Mtask, BatchSt) Handover, Mgroup, Mlogb, Mtask, BatchSt)
from apps.mtm.models import Route from apps.mtm.models import Route, Material
from django.db.models import Q from django.db.models import Q
from rest_framework.exceptions import ParseError from rest_framework.exceptions import ParseError
@ -49,6 +49,7 @@ class WMaterialFilter(filters.FilterSet):
if mgroup: if mgroup:
process = Mgroup.objects.get(id=mgroup).process process = Mgroup.objects.get(id=mgroup).process
matoutIds = process.get_canout_mat_ids() matoutIds = process.get_canout_mat_ids()
queryset = queryset.filter(material__type__in=[Material.MA_TYPE_MAINSO, Material.MA_TYPE_HALFGOOD, Material.MA_TYPE_GOOD])
if value == "todo": if value == "todo":
qs = queryset.exclude(material__id__in=matoutIds).exclude(state=WMaterial.WM_REPAIRED)|queryset.filter(state=WMaterial.WM_REPAIR) qs = queryset.exclude(material__id__in=matoutIds).exclude(state=WMaterial.WM_REPAIRED)|queryset.filter(state=WMaterial.WM_REPAIR)
return qs return qs