diff --git a/hb_server/apps/mtm/migrations/0022_auto_20211014_0944.py b/hb_server/apps/mtm/migrations/0022_auto_20211014_0944.py new file mode 100644 index 0000000..4a6f086 --- /dev/null +++ b/hb_server/apps/mtm/migrations/0022_auto_20211014_0944.py @@ -0,0 +1,26 @@ +# Generated by Django 3.2.6 on 2021-10-14 01:44 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('em', '0009_auto_20210916_1108'), + ('mtm', '0021_auto_20211013_0856'), + ] + + operations = [ + migrations.AddField( + model_name='subproduction', + name='process', + field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, related_name='subproduction_process', to='mtm.process', verbose_name='隶属大工序'), + preserve_default=False, + ), + migrations.AlterField( + model_name='step', + name='equipments', + field=models.ManyToManyField(related_name='step_equips', to='em.Equipment', verbose_name='使用设备'), + ), + ] diff --git a/hb_server/apps/mtm/serializers.py b/hb_server/apps/mtm/serializers.py index 5f0d43a..5da68a4 100644 --- a/hb_server/apps/mtm/serializers.py +++ b/hb_server/apps/mtm/serializers.py @@ -62,6 +62,7 @@ class StepDetailSerializer(serializers.ModelSerializer): return queryset class SubProductionSerializer(serializers.ModelSerializer): + process_ = ProcessSimpleSerializer(source='process', read_only=True) class Meta: model = SubProduction fields = '__all__' diff --git a/hb_server/apps/mtm/views.py b/hb_server/apps/mtm/views.py index 3a4ce4c..22378ba 100644 --- a/hb_server/apps/mtm/views.py +++ b/hb_server/apps/mtm/views.py @@ -74,7 +74,7 @@ class SubProductionViewSet(CreateUpdateModelAMixin, ModelViewSet): 产品生产分解增删改查 """ perms_map={'*':'*'} - queryset = SubProduction.objects.all() + queryset = SubProduction.objects.select_related('process').all() filterset_fields = ['product', 'process'] search_fields = ['name'] serializer_class = SubProductionSerializer diff --git a/hb_server/apps/wf/migrations/0013_alter_ticketflow_transition.py b/hb_server/apps/wf/migrations/0013_alter_ticketflow_transition.py new file mode 100644 index 0000000..4b3fc80 --- /dev/null +++ b/hb_server/apps/wf/migrations/0013_alter_ticketflow_transition.py @@ -0,0 +1,19 @@ +# Generated by Django 3.2.6 on 2021-10-14 01:44 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('wf', '0012_ticketflow_intervene_type'), + ] + + operations = [ + migrations.AlterField( + model_name='ticketflow', + name='transition', + field=models.ForeignKey(blank=True, help_text='与worklow.Transition关联, 为空时表示认为干预的操作', null=True, on_delete=django.db.models.deletion.CASCADE, to='wf.transition', verbose_name='流转id'), + ), + ]