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

fix: 初始化检测bug

This commit is contained in:
caoqianming 2023-07-05 16:39:01 +08:00
parent 07f517de58
commit e0fcb2e22b
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/qm/serializers.py
View File

@ -21,7 +21,7 @@ class QuaStatSerializer(CustomModelSerializer):
model = QuaStat
fields = '__all__'
read_only_fields = EXCLUDE_FIELDS + ['type', 'rate_pass', 'year_s', 'month_s', 'day_s', 'belong_dept']
extra_kwargs = {'val_avg': {'required': True}, 'num_test':{'required': True}, 'num_ok': {'required': True}}
extra_kwargs = {'val_avg': {'required': True, 'allow_null': False}, 'num_test':{'required': True, 'allow_null': False}, 'num_ok': {'required': True, 'allow_null': False}}
def validate(self, attrs):
attrs['type'] = 'sflog'
@ -41,4 +41,8 @@ class QuaStatUpdateSerializer(CustomModelSerializer):
model = QuaStat
fields = '__all__'
read_only_fields = EXCLUDE_FIELDS + ['type', 'rate_pass', 'year_s', 'month_s', 'day_s', 'belong_dept', 'sflog', 'material', 'testitem']
extra_kwargs = {'val_avg': {'required': True}, 'num_test':{'required': True}, 'num_ok': {'required': True}}
extra_kwargs = {'val_avg': {'required': True, 'allow_null': False}, 'num_test':{'required': True, 'allow_null': False}, 'num_ok': {'required': True, 'allow_null': False}}
def validate(self, attrs):
attrs['rate_pass'] = attrs['num_ok']/attrs['num_test']
return super().validate(attrs)

1
apps/wpm/views.py
View File

@ -81,7 +81,6 @@ class SfLogViewSet(UpdateModelMixin, ListModelMixin, DestroyModelMixin, CustomGe
params = {'type': 'sflog', 'material': material, 'testitem': testitem, 'sflog': obj}
params_default = params.update({'year_s': end_time_local.year, 'month_s': end_time_local.month, 'day_s': end_time_local.day})
ins, _ = QuaStat.objects.get_or_create(**params, defaults=params_default)
ins.rate_pass = ins.num_ok / ins.num_test
if ins.create_by is None:
ins.create_by = request.user
ins.belong_dept = obj.mgroup.belong_dept