From bcf99f1515a703a3bb2212defe59efa8dee8c3f6 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 19 Apr 2022 11:10:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E8=A1=A8=E6=A8=A1=E6=9D=BF=E4=BB=A5=E5=8F=8A=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E9=A1=B9span=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hb_server/apps/hrm/services.py | 2 +- .../mtm/migrations/0050_auto_20220419_1109.py | 23 +++++++++++++++++++ hb_server/apps/mtm/models.py | 3 ++- hb_server/apps/pm/serializers.py | 7 ------ hb_server/apps/qm/serializers.py | 2 ++ hb_server/apps/system/serializers.py | 6 +++++ 6 files changed, 34 insertions(+), 9 deletions(-) create mode 100644 hb_server/apps/mtm/migrations/0050_auto_20220419_1109.py diff --git a/hb_server/apps/hrm/services.py b/hb_server/apps/hrm/services.py index eca4639..180ea62 100644 --- a/hb_server/apps/hrm/services.py +++ b/hb_server/apps/hrm/services.py @@ -30,7 +30,7 @@ class HRMService: face_datas = cache.get('face_datas') face_users = cache.get('face_users') results = face_recognition.compare_faces(face_datas, - unknown_face_encoding, tolerance=0.45) + unknown_face_encoding, tolerance=0.42) for index, value in enumerate(results): if value: # 识别成功 diff --git a/hb_server/apps/mtm/migrations/0050_auto_20220419_1109.py b/hb_server/apps/mtm/migrations/0050_auto_20220419_1109.py new file mode 100644 index 0000000..344566a --- /dev/null +++ b/hb_server/apps/mtm/migrations/0050_auto_20220419_1109.py @@ -0,0 +1,23 @@ +# Generated by Django 3.2.9 on 2022-04-19 03:09 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('mtm', '0049_auto_20220222_0944'), + ] + + operations = [ + migrations.AddField( + model_name='recordform', + name='export_template', + field=models.CharField(blank=True, max_length=200, null=True, verbose_name='导出模板'), + ), + migrations.AddField( + model_name='recordformfield', + name='span', + field=models.PositiveSmallIntegerField(default=12, verbose_name='span值'), + ), + ] diff --git a/hb_server/apps/mtm/models.py b/hb_server/apps/mtm/models.py index 9ea0abd..d54c93a 100644 --- a/hb_server/apps/mtm/models.py +++ b/hb_server/apps/mtm/models.py @@ -139,6 +139,7 @@ class RecordForm(CommonAModel): material = models.ForeignKey(Material, verbose_name='关联物料', on_delete=models.CASCADE, null=True, blank=True) enabled = models.BooleanField('是否启用', default=False) number = models.CharField('编号', null=True, blank=True, max_length=32) + export_template = models.CharField('导出模板', max_length=200, null=True, blank=True) class Meta: verbose_name = '记录表格' @@ -212,7 +213,7 @@ class RecordFormField(CommonAModel): parent = models.ForeignKey('self', verbose_name='父', on_delete=models.CASCADE, null=True, blank=True) draw_template = models.CharField('绘图模板', max_length=200, null=True, blank=True) - + span = models.PositiveSmallIntegerField('span值', default=12) class Meta: verbose_name = '记录表格字段' diff --git a/hb_server/apps/pm/serializers.py b/hb_server/apps/pm/serializers.py index 0d653fd..a261748 100644 --- a/hb_server/apps/pm/serializers.py +++ b/hb_server/apps/pm/serializers.py @@ -2,7 +2,6 @@ from apps.mtm.models import RecordForm from apps.pm.models import ProductionPlan, SubProductionPlan, SubProductionProgress from rest_framework import serializers from apps.qm.models import TestRecord -from apps.qm.serializers import TestRecordShortSerializer from apps.sam.serializers import OrderSerializer, OrderSimpleSerializer from apps.mtm.serializers import MaterialSimpleSerializer, ProcessSimpleSerializer, RecordFormSimpleSerializer, SubProductionSimpleSerializer from apps.system.serializers import OrganizationSimpleSerializer, UserSimpleSerializer @@ -44,8 +43,6 @@ class SubProductionPlanListSerializer(DynamicFieldsSerializerMixin, serializers. leader_1_ = UserSimpleSerializer(source='leader_1', read_only=True) leader_2_ = UserSimpleSerializer(source='leader_2', read_only=True) leader_3_ = UserSimpleSerializer(source='leader_3', read_only=True) - first_test_ = TestRecordShortSerializer(source='first_test', read_only=True) - # first_test_ = serializers.SerializerMethodField() class Meta: model=SubProductionPlan fields = '__all__' @@ -53,10 +50,6 @@ class SubProductionPlanListSerializer(DynamicFieldsSerializerMixin, serializers. def get_plan_product_(self, obj): return MaterialSimpleSerializer(instance=obj.production_plan.product).data - # def get_first_test_(self, obj): - # if obj.first_test: - # return TestRecordShortSerializer(instance=obj.first_test).data - # return None class SubProductionPlanUpdateSerializer(serializers.ModelSerializer): diff --git a/hb_server/apps/qm/serializers.py b/hb_server/apps/qm/serializers.py index 93d5a76..494f30c 100644 --- a/hb_server/apps/qm/serializers.py +++ b/hb_server/apps/qm/serializers.py @@ -2,6 +2,7 @@ from rest_framework import serializers from apps.mtm.models import RecordForm, RecordFormField from apps.mtm.serializers import RecordFormFieldSerializer, RecordFormSimpleSerializer from apps.system.serializers import FileSimpleSerializer, UserSimpleSerializer +from apps.wpm.serializers import WProductBaseSerializer from .models import Standard, TestItem, TestRecord, TestRecordItem from django.db import transaction @@ -99,6 +100,7 @@ class TestRecordDetailSerializer(serializers.ModelSerializer): origin_test_ = TestRecordDetailBaseSerializer(source='origin_test', read_only=True) create_by_ = UserSimpleSerializer(source='create_by', read_only=True) update_by_ = UserSimpleSerializer(source='update_by', read_only=True) + wproduct_ = WProductBaseSerializer(source='wproduct', read_only=True) class Meta: model = TestRecord fields = '__all__' diff --git a/hb_server/apps/system/serializers.py b/hb_server/apps/system/serializers.py index 45d8c29..c5a684b 100644 --- a/hb_server/apps/system/serializers.py +++ b/hb_server/apps/system/serializers.py @@ -122,9 +122,15 @@ class OrganizationSimpleSerializer(serializers.ModelSerializer): fields = ['id', 'name'] class UserSimpleSerializer(serializers.ModelSerializer): + signature= serializers.SerializerMethodField() class Meta: model = User fields = ['id', 'username', 'name'] + + def get_signature(self, obj): + if obj.employee_user: + return obj.employee_user.signature + return None # class UserStandardSerializer(serializers.ModelSerializer): # dept_name = serializers.StringRelatedField(source='dept')