Compare commits
No commits in common. "a5f32dbeda8020e64fcc1fecba9c2f18612e6484" and "1ea9ef48a634e97dc645296edebb3802e9b7fa1e" have entirely different histories.
a5f32dbeda
...
1ea9ef48a6
|
|
@ -38,11 +38,9 @@ class WprFilter(filters.FilterSet):
|
||||||
elif value == "done":
|
elif value == "done":
|
||||||
matoutIds = process.get_canout_mat_ids()
|
matoutIds = process.get_canout_mat_ids()
|
||||||
qs = queryset.filter(material__id__in=matoutIds).exclude(state=WMaterial.WM_REPAIR)|queryset.filter(state=WMaterial.WM_REPAIRED, wm__mgroup__id=mgroupId)
|
qs = queryset.filter(material__id__in=matoutIds).exclude(state=WMaterial.WM_REPAIR)|queryset.filter(state=WMaterial.WM_REPAIRED, wm__mgroup__id=mgroupId)
|
||||||
return qs
|
|
||||||
elif value == "canfix":
|
elif value == "canfix":
|
||||||
matoutIds = process.get_canout_mat_ids()
|
matoutIds = process.get_canout_mat_ids()
|
||||||
qs = queryset.filter(state=WMaterial.WM_REPAIR, wm__mgroup__id=mgroupId)| queryset.filter(material__id__in=matoutIds, state=WMaterial.WM_NOTOK)
|
qs = queryset.filter(state=WMaterial.WM_REPAIR, wm__mgroup__id=mgroupId)| queryset.filter(material__id__in=matoutIds, state=WMaterial.WM_NOTOK)
|
||||||
return qs
|
|
||||||
else:
|
else:
|
||||||
raise ParseError("请提供工段查询条件")
|
raise ParseError("请提供工段查询条件")
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue