diff --git a/apps/mtm/migrations/0006_auto_20230725_1357.py b/apps/mtm/migrations/0006_auto_20230725_1357.py new file mode 100644 index 00000000..6471544d --- /dev/null +++ b/apps/mtm/migrations/0006_auto_20230725_1357.py @@ -0,0 +1,21 @@ +# Generated by Django 3.2.12 on 2023-07-25 05:57 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('mtm', '0005_auto_20230706_1032'), + ] + + operations = [ + migrations.RemoveField( + model_name='goal', + name='product', + ), + migrations.RemoveField( + model_name='goal', + name='team', + ), + ] diff --git a/apps/mtm/models.py b/apps/mtm/models.py index b4d7541b..73647099 100644 --- a/apps/mtm/models.py +++ b/apps/mtm/models.py @@ -68,8 +68,6 @@ class Goal(CommonADModel): """目标 """ mgroup = models.ForeignKey(Mgroup, verbose_name='关联工段', on_delete=models.CASCADE, null=True, blank=True) - product = models.ForeignKey(Material, verbose_name='关联产品', on_delete=models.CASCADE, null=True, blank=True) - team = models.ForeignKey(Team, verbose_name='关联班组', on_delete=models.CASCADE, null=True, blank=True) year = models.PositiveSmallIntegerField('年') goal_cate = models.ForeignKey(Dictionary, verbose_name='目标种类', on_delete=models.CASCADE) goal_val = models.FloatField('全年目标值') diff --git a/apps/mtm/serializers.py b/apps/mtm/serializers.py index e19af800..d09e678f 100644 --- a/apps/mtm/serializers.py +++ b/apps/mtm/serializers.py @@ -35,6 +35,8 @@ class TeamSerializer(CustomModelSerializer): class GoalSerializer(CustomModelSerializer): + goal_cate_name = serializers.CharField(source='goal_cate.name', read_only=True) + mgroup_name = serializers.CharField(source='mgroup.name', read_only=True) class Meta: model = Goal fields = '__all__'