diff --git a/hb_server/apps/wpm/serializers.py b/hb_server/apps/wpm/serializers.py index cb36774..2d48b4d 100644 --- a/hb_server/apps/wpm/serializers.py +++ b/hb_server/apps/wpm/serializers.py @@ -449,7 +449,7 @@ class WproductTicketListSerializer(serializers.ModelSerializer): class CuttingListSerializer(serializers.ModelSerializer): subproduction_plan_ = SubproductionPlanSimpleSerializer(source='subproduction_plan', 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: model = OperationMaterial fields = '__all__' \ No newline at end of file diff --git a/hb_server/apps/wpm/views.py b/hb_server/apps/wpm/views.py index 08dc91b..09d144d 100644 --- a/hb_server/apps/wpm/views.py +++ b/hb_server/apps/wpm/views.py @@ -805,7 +805,7 @@ class CuttingListViewSet(ListModelMixin, GenericViewSet): """ perms_map={'*':'*'} 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 filterset_class = CuttingFilterSet ordering_fields = ['id']