diff --git a/apps/mtm/filters.py b/apps/mtm/filters.py index 7b39092a..00f21050 100644 --- a/apps/mtm/filters.py +++ b/apps/mtm/filters.py @@ -8,6 +8,7 @@ class MaterialFilter(filters.FilterSet): model = Material fields = { "type": ["exact", "in"], + "is_hidden": ["exact"] } def filter_tag(self, queryset, name, value): diff --git a/apps/mtm/migrations/0012_auto_20230926_1054.py b/apps/mtm/migrations/0012_auto_20230926_1054.py new file mode 100644 index 00000000..127c9807 --- /dev/null +++ b/apps/mtm/migrations/0012_auto_20230926_1054.py @@ -0,0 +1,23 @@ +# Generated by Django 3.2.12 on 2023-09-26 02:54 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('mtm', '0011_auto_20230922_1601'), + ] + + operations = [ + migrations.AddField( + model_name='material', + name='is_hidden', + field=models.BooleanField(default=False, verbose_name='是否隐藏'), + ), + migrations.AlterField( + model_name='route', + name='out_rate', + field=models.FloatField(blank=True, default=100, null=True, verbose_name='出材率'), + ), + ] diff --git a/apps/mtm/models.py b/apps/mtm/models.py index bf45eb93..c57e2aeb 100644 --- a/apps/mtm/models.py +++ b/apps/mtm/models.py @@ -45,6 +45,7 @@ class Material(CommonAModel): count_safe = models.PositiveIntegerField('安全库存总数', null=True, blank=True) process = models.ForeignKey(Process, verbose_name='所在工序', on_delete=models.CASCADE, null=True, blank=True) parent = models.ForeignKey('self', null=True, blank=True, on_delete=models.SET_NULL, verbose_name='父物料') + is_hidden = models.BooleanField('是否隐藏', default=False) class Meta: verbose_name = '物料表' @@ -118,4 +119,4 @@ class Route(CommonAModel): process = models.ForeignKey(Process, verbose_name='工序', on_delete=models.CASCADE, null=True, blank=True) sort = models.PositiveSmallIntegerField('顺序', default=1) is_autotask = models.BooleanField('是否自动排产', default=False) - out_rate = models.FloatField('出材率', default=100) \ No newline at end of file + out_rate = models.FloatField('出材率', default=100, null=True, blank=True) \ No newline at end of file