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

检验记录每一项目都有update_by

This commit is contained in:
caoqianming 2022-01-29 09:34:25 +08:00
parent a0de3ed58f
commit 41bcda4f5c
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hb_server/apps/qm/models.py
View File

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

6
hb_server/apps/qm/serializers.py
View File

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

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

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