testrecord update bug
This commit is contained in:
parent
80720a0734
commit
275068a7a5
|
@ -112,7 +112,7 @@ class TestRecordItemUpdatexSerializer(serializers.Serializer):
|
|||
is_hidden = serializers.BooleanField(default=False)
|
||||
|
||||
class TestRecordUpdateSerializer(serializers.ModelSerializer):
|
||||
record_data = TestRecordItemUpdatexSerializer(many=True)
|
||||
record_data = TestRecordItemUpdatexSerializer(many=True, write_only=True)
|
||||
class Meta:
|
||||
model = TestRecord
|
||||
fields = ['is_testok', 'record_data']
|
||||
|
|
|
@ -294,15 +294,15 @@ class WpmTestRecordCreateSerializer(serializers.ModelSerializer):
|
|||
|
||||
class WpmTestFormInitSerializer(serializers.Serializer):
|
||||
wproduct = serializers.PrimaryKeyRelatedField(queryset=WProduct.objects.all(), required=True)
|
||||
form = serializers.PrimaryKeyRelatedField(queryset=RecordForm.objects.all(), required=False)
|
||||
form = serializers.PrimaryKeyRelatedField(queryset=RecordForm.objects.all(), required=True)
|
||||
|
||||
def validate(self, attrs):
|
||||
wproduct = attrs['wproduct']
|
||||
form = attrs.get('form', None)
|
||||
if wproduct.act_state != WProduct.WPR_ACT_STATE_TORETEST:
|
||||
if not form:
|
||||
raise exceptions.APIException('请指定检查表')
|
||||
return super().validate(attrs)
|
||||
# def validate(self, attrs):
|
||||
# wproduct = attrs['wproduct']
|
||||
# form = attrs.get('form', None)
|
||||
# if wproduct.act_state != WProduct.WPR_ACT_STATE_TORETEST:
|
||||
# if not form:
|
||||
# raise exceptions.APIException('请指定检查表')
|
||||
# return super().validate(attrs)
|
||||
|
||||
|
||||
class WplanPutInSerializer(serializers.Serializer):
|
||||
|
|
|
@ -193,7 +193,7 @@ class WProductViewSet(ListModelMixin, GenericViewSet):
|
|||
serializer.is_valid(raise_exception=True)
|
||||
vdata = serializer.validated_data
|
||||
wproduct = vdata['wproduct']
|
||||
form = vdata.get('form', None)
|
||||
form = vdata['form']
|
||||
if wproduct.test:
|
||||
raise exceptions.APIException('存在进行中检验')
|
||||
|
||||
|
@ -203,7 +203,7 @@ class WProductViewSet(ListModelMixin, GenericViewSet):
|
|||
trs = wproduct.last_process_test
|
||||
if trs:
|
||||
origin_test = TestRecordDetailSerializer(instance=trs).data
|
||||
data = RecordFormDetailSerializer(instance=trs.form).data
|
||||
data = RecordFormDetailSerializer(instance=form).data
|
||||
data['origin_test'] = origin_test
|
||||
o_dict = {}
|
||||
for i in origin_test['record_data']:
|
||||
|
@ -365,6 +365,10 @@ class WProductViewSet(ListModelMixin, GenericViewSet):
|
|||
return Response()
|
||||
|
||||
|
||||
def workflows(self, request, pk=None):
|
||||
"""
|
||||
可发起的工作流
|
||||
"""
|
||||
class OperationViewSet(ListModelMixin, RetrieveModelMixin, CreateModelMixin, UpdateModelMixin, DestroyModelMixin, GenericViewSet):
|
||||
"""
|
||||
生产操作记录
|
||||
|
|
Loading…
Reference in New Issue