From 888185c4c06850fd2c1aa829b016123cec7bc120 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com> Date: Thu, 9 Jun 2022 08:14:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E5=8E=BB=E9=99=A4=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mtm/migrations/0053_alter_material_unit.py | 18 ++++++++++++++++++ hb_server/apps/mtm/models.py | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 hb_server/apps/mtm/migrations/0053_alter_material_unit.py diff --git a/hb_server/apps/mtm/migrations/0053_alter_material_unit.py b/hb_server/apps/mtm/migrations/0053_alter_material_unit.py new file mode 100644 index 0000000..ef671ae --- /dev/null +++ b/hb_server/apps/mtm/migrations/0053_alter_material_unit.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.9 on 2022-06-09 00:14 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('mtm', '0052_material_brand'), + ] + + operations = [ + migrations.AlterField( + model_name='material', + name='unit', + field=models.CharField(default='块', max_length=10, verbose_name='基准计量单位'), + ), + ] diff --git a/hb_server/apps/mtm/models.py b/hb_server/apps/mtm/models.py index e40969a..4603bd5 100644 --- a/hb_server/apps/mtm/models.py +++ b/hb_server/apps/mtm/models.py @@ -40,7 +40,7 @@ class Material(CommonAModel): specification = models.CharField('型号', max_length=100, null=True, blank=True) type = models.PositiveSmallIntegerField('物料类型', choices= type_choices, default=1) sort_str = models.CharField('排序字符', max_length=100, null=True, blank=True) - unit = models.CharField('基准计量单位', choices=unit_choices, default='块', max_length=10) + unit = models.CharField('基准计量单位', default='块', max_length=10) count = models.PositiveIntegerField('物料库存总数', default=0) count_safe = models.PositiveIntegerField('安全库存总数', null=True, blank=True) piece_count = models.PositiveSmallIntegerField('单片玻璃数量', null=True, blank=True) From 9f15520dae3fa4e61ddcbd56cbe82790c5f03a27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com> Date: Thu, 9 Jun 2022 12:36:56 +0800 Subject: [PATCH 2/2] write only true --- hb_server/apps/mtm/serializers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hb_server/apps/mtm/serializers.py b/hb_server/apps/mtm/serializers.py index 83ef853..43681b1 100644 --- a/hb_server/apps/mtm/serializers.py +++ b/hb_server/apps/mtm/serializers.py @@ -211,7 +211,7 @@ class RecordFormSerializer(serializers.ModelSerializer): class RecordFormCreateSerializer(serializers.ModelSerializer): form = serializers.PrimaryKeyRelatedField( - queryset=RecordForm.objects.all(), label="复制表ID", required=False) + queryset=RecordForm.objects.all(), label="复制表ID", required=False, write_only=True) class Meta: model = RecordForm fields = ['name', 'type', 'step', 'material', 'number', 'enabled', 'form', 'export_template'] @@ -227,7 +227,7 @@ class RecordFormCreateSerializer(serializers.ModelSerializer): class RecordFormUpdateSerializer(serializers.ModelSerializer): class Meta: model = RecordForm - fields = ['name', 'type', 'number', 'enabled', 'export_template', 'material', 'form'] + fields = ['name', 'type', 'number', 'enabled', 'export_template', 'material'] # def validate(self, attrs): # if attrs['enabled']: