Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop

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='基准计量单位'),
+        ),
+    ]

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)

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']: