Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop
This commit is contained in:
commit
ffc49921c7
|
@ -23,5 +23,5 @@ class SubproductionProgressFilterSet(filters.FilterSet):
|
|||
subplans = WpmServies.get_subplans_queyset_from_step(step)
|
||||
queryset = queryset.filter(subproduction_plan__in=subplans)
|
||||
if step.type == Step.STEP_TYPE_NOM:
|
||||
queryset = queryset.exclude(material__type=Material.MA_TYPE_HALFGOOD)
|
||||
queryset = queryset.exclude(material__type__in =[Material.MA_TYPE_HALFGOOD, Material.MA_TYPE_GOOD])
|
||||
return queryset
|
Loading…
Reference in New Issue