检验记录每一项目都有update_by

hb_server/apps/qm/models.py

@@ -73,7 +73,7 @@ class TestRecord(CommonADModel):
     remark = models.TextField('备注', default='')
 
 
-class TestRecordItem(BaseModel):
+class TestRecordItem(CommonADModel):
     """
     记录表格字段值
     """

hb_server/apps/qm/serializers.py

@@ -124,13 +124,17 @@ class TestRecordUpdateSerializer(serializers.ModelSerializer):
         fields = ['is_testok', 'record_data']
 
     def update(self, instance, validated_data):
+        # 获取更新人
+        update_by = self.context['request'].user
         record_data = validated_data.pop('record_data')
         for attr, value in validated_data.items():
             setattr(instance, attr, value)
-        instance.save()
+        instance.save(update_by=update_by)
         for i in record_data:
             tri = i['id']
-            tri.field_value = i['field_value']
+            if i['field_value'] != tri.field_value:
+                tri.field_value = i['field_value']
+                tri.update_by = update_by
             tri.is_testok = i['is_testok']
             tri.is_hidden = i['is_hidden']
             tri.save()

hb_server/apps/wpm/views.py

@@ -190,7 +190,7 @@ class WProductViewSet(ListModelMixin, RetrieveModelMixin, GenericViewSet):
             raise exceptions.APIException('该产品当前状态不可检验')
 
         savedict = dict(
-            create_by=self.request.user,
+            create_by=request.user,
             wproduct=wproduct,
             material=wproduct.material,
             number=wproduct.number,
@@ -221,6 +221,7 @@ class WProductViewSet(ListModelMixin, RetrieveModelMixin, GenericViewSet):
             tri.test_record = tr
             tri.form_field = i
             tri.is_hidden = i.is_hidden
+            tri.create_by = request.user
             tri.save()
         return Response(TestRecordDetailSerializer(instance=tr).data)