diff --git a/hb_server/apps/mtm/migrations/0052_material_brand.py b/hb_server/apps/mtm/migrations/0052_material_brand.py new file mode 100644 index 0000000..3c27b29 --- /dev/null +++ b/hb_server/apps/mtm/migrations/0052_material_brand.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.9 on 2022-06-06 05:15 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('mtm', '0051_material_file'), + ] + + operations = [ + migrations.AddField( + model_name='material', + name='brand', + field=models.CharField(blank=True, max_length=100, null=True, verbose_name='牌号'), + ), + ] diff --git a/hb_server/apps/mtm/models.py b/hb_server/apps/mtm/models.py index 9266ff6..e40969a 100644 --- a/hb_server/apps/mtm/models.py +++ b/hb_server/apps/mtm/models.py @@ -36,6 +36,7 @@ class Material(CommonAModel): ) name = models.CharField('物料名称', max_length=100) number = models.CharField('编号', max_length=100, unique=True) + brand = models.CharField('牌号', max_length=100, null=True, blank=True) 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) diff --git a/hb_server/apps/mtm/serializers.py b/hb_server/apps/mtm/serializers.py index 8e77bd3..83ef853 100644 --- a/hb_server/apps/mtm/serializers.py +++ b/hb_server/apps/mtm/serializers.py @@ -46,7 +46,7 @@ class PackItemUpdateSerializer(serializers.ModelSerializer): class MaterialSimpleSerializer(serializers.ModelSerializer): class Meta: model = Material - fields = ['id', 'name', 'number', 'unit','specification', 'type', 'count', 'count_safe'] + fields = ['id', 'name', 'number', 'unit','specification', 'type', 'count', 'count_safe', 'brand'] class PackItemDetailSerializer(serializers.ModelSerializer): material_ = MaterialSimpleSerializer(source='material', read_only=True) diff --git a/hb_server/apps/mtm/views.py b/hb_server/apps/mtm/views.py index ee46787..9220df3 100644 --- a/hb_server/apps/mtm/views.py +++ b/hb_server/apps/mtm/views.py @@ -184,7 +184,7 @@ class RecordFormViewSet(OptimizationMixin, CreateUpdateModelAMixin, ModelViewSet queryset = RecordForm.objects.all() filterset_fields = ['step', 'type', 'material', 'number', 'enabled'] search_fields = ['name'] - ordering='id' + ordering=['id'] def get_serializer_class(self): @@ -234,8 +234,8 @@ class RecordFormFieldViewSet(OptimizationMixin, CreateUpdateModelAMixin, ModelVi queryset = RecordFormField.objects.all() filterset_fields = ['field_type', 'form'] search_fields = ['field_name', 'field_key'] - ordering = 'sort' - ordering_fields = ['sort', 'id'] + ordering = ['sort', 'create_time'] + ordering_fields = ['sort', 'create_time'] def get_serializer_class(self): if self.action =='create':