diff --git a/apps/em/filters.py b/apps/em/filters.py index 443e6f74..fb470786 100644 --- a/apps/em/filters.py +++ b/apps/em/filters.py @@ -6,6 +6,8 @@ from apps.utils.filters import MyJsonListFilter class EquipFilterSet(filters.FilterSet): tags = MyJsonListFilter(label='tags/json/list查询') + exclude_cate_name = filters.CharFilter( + field_name='cate__name', exclude=True, label='排除设备分类名称') class Meta: model = Equipment diff --git a/apps/wpm/migrations/0139_mloguser_note.py b/apps/wpm/migrations/0139_mloguser_note.py new file mode 100644 index 00000000..49059e92 --- /dev/null +++ b/apps/wpm/migrations/0139_mloguser_note.py @@ -0,0 +1,16 @@ +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('wpm', '0138_mlogbw_files'), + ] + + operations = [ + migrations.AddField( + model_name='mloguser', + name='note', + field=models.TextField(blank=True, default='', verbose_name='备注'), + ), + ] diff --git a/apps/wpm/models.py b/apps/wpm/models.py index 9a3c0e51..f4c87c76 100644 --- a/apps/wpm/models.py +++ b/apps/wpm/models.py @@ -550,6 +550,7 @@ class MlogUser(BaseModel): Equipment, verbose_name='生产设备', on_delete=models.CASCADE, null=True, blank=True, related_name='mloguser_equipment') shift = models.ForeignKey(Shift, verbose_name='关联班次', on_delete=models.CASCADE) handle_date = models.DateField('操作日期') + note = models.TextField('备注', default='', blank=True) class Mlogb(BaseModel): """