feat: 增加utask mgroup和material_in 字段

This commit is contained in:
caoqianming 2023-10-25 18:49:53 +08:00
parent 6f7f9d29e9
commit bc57f49e6a
3 changed files with 30 additions and 0 deletions

View File

@ -16,6 +16,7 @@ class UtaskFilter(filters.FilterSet):
"material": ["exact"],
"material__type": ["exact"],
"material__is_hidden": ["exact"],
"mgroup__belong_dept__name": ["exact"],
"mtask_utask__mgroup": ["exact"],
"mtask_utask__mgroup__belong_dept": ['exact'],
"mtask_utask__mgroup__belong_dept__name": ['exact']

View File

@ -0,0 +1,25 @@
# Generated by Django 3.2.12 on 2023-10-25 10:45
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('mtm', '0018_material_need_route'),
('pm', '0008_alter_mtask_utask'),
]
operations = [
migrations.AddField(
model_name='utask',
name='material_in',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='utask_material_in', to='mtm.material', verbose_name='领用物'),
),
migrations.AddField(
model_name='utask',
name='mgroup',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='mtm.mgroup', verbose_name='工段'),
),
]

View File

@ -24,6 +24,10 @@ class Utask(CommonADModel):
number = models.CharField('编号', max_length=50, unique=True)
material = models.ForeignKey(
Material, verbose_name='产品', on_delete=models.CASCADE)
mgroup = models.ForeignKey(
Mgroup, verbose_name='工段', on_delete=models.CASCADE, null=True, blank=True)
material_in = models.ForeignKey(
Material, verbose_name='领用物', on_delete=models.CASCADE, related_name='utask_material_in', null=True, blank=True)
count = models.PositiveIntegerField('任务数', default=1)
count_real = models.PositiveIntegerField('实际生产数', default=0)
count_ok = models.PositiveIntegerField('合格数', default=0)