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

下料清单queryset

This commit is contained in:
caoqianming 2022-01-05 09:26:50 +08:00
parent ccd2d2e375
commit 9ad37f0cef
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hb_server/apps/wpm/serializers.py
View File

@ -449,7 +449,7 @@ class WproductTicketListSerializer(serializers.ModelSerializer):
class CuttingListSerializer(serializers.ModelSerializer): class CuttingListSerializer(serializers.ModelSerializer):
subproduction_plan_ = SubproductionPlanSimpleSerializer(source='subproduction_plan', read_only=True) subproduction_plan_ = SubproductionPlanSimpleSerializer(source='subproduction_plan', read_only=True)
from_material_ = MaterialSimpleSerializer(source='from_material', read_only=True) from_material_ = MaterialSimpleSerializer(source='from_material', read_only=True)
create_by_ = UserSimpleSerializer(source='create_by', read_only=True) create_by_ = UserSimpleSerializer(source='operation.create_by', read_only=True)
class Meta: class Meta:
model = OperationMaterial model = OperationMaterial
fields = '__all__' fields = '__all__'

2
hb_server/apps/wpm/views.py
View File

@ -805,7 +805,7 @@ class CuttingListViewSet(ListModelMixin, GenericViewSet):
""" """
perms_map={'*':'*'} perms_map={'*':'*'}
queryset = OperationMaterial.objects.select_related('operation', queryset = OperationMaterial.objects.select_related('operation',
'subproduction_plan', 'material', 'create_by').filter(operation__step__process__id=1) 'subproduction_plan', 'material', 'operation__create_by').filter(operation__step__id=1, type=SubprodctionMaterial.SUB_MA_TYPE_OUT)
serializer_class = CuttingListSerializer serializer_class = CuttingListSerializer
filterset_class = CuttingFilterSet filterset_class = CuttingFilterSet
ordering_fields = ['id'] ordering_fields = ['id']