diff --git a/apps/sam/migrations/0003_orderitem_mtask.py b/apps/sam/migrations/0003_orderitem_mtask.py new file mode 100644 index 00000000..cc9f5251 --- /dev/null +++ b/apps/sam/migrations/0003_orderitem_mtask.py @@ -0,0 +1,20 @@ +# Generated by Django 3.2.12 on 2023-09-26 02:54 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('pm', '0002_remove_mtask_order'), + ('sam', '0002_auto_20230921_1018'), + ] + + operations = [ + migrations.AddField( + model_name='orderitem', + name='mtask', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='pm.mtask', verbose_name='关联生产任务'), + ), + ] diff --git a/apps/sam/models.py b/apps/sam/models.py index 01fa97a4..069cd150 100644 --- a/apps/sam/models.py +++ b/apps/sam/models.py @@ -74,5 +74,6 @@ class OrderItem(BaseModel): material = models.ForeignKey(Material, verbose_name='所需产品', on_delete=models.CASCADE) count = models.PositiveIntegerField('所需数量', default=1) delivered_count = models.PositiveIntegerField('已交货数量', default=0) + mtask = models.ForeignKey('pm.mtask', verbose_name='关联生产任务', on_delete=models.SET_NULL, null=True, blank=True) \ No newline at end of file diff --git a/apps/sam/views.py b/apps/sam/views.py index f0c61081..87fef429 100644 --- a/apps/sam/views.py +++ b/apps/sam/views.py @@ -86,7 +86,7 @@ class OrderItemViewSet(ListModelMixin, CreateModelMixin, DestroyModelMixin, Cust queryset = OrderItem.objects.all() serializer_class = OrderItemSerializer select_related_fields = ['order', 'material'] - filterset_fields = ['order', 'material'] + filterset_fields = ['order', 'material', 'mtask'] ordering = ['create_time']