feat: mpoint增加是否可手动录入的字段

This commit is contained in:
caoqianming 2024-04-24 14:59:37 +08:00
parent 4d559222ba
commit 86053bed93
4 changed files with 22 additions and 1 deletions

View File

@ -0,0 +1,18 @@
# Generated by Django 3.2.12 on 2024-04-24 06:50
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('enm', '0029_remove_mpoint_is_all'),
]
operations = [
migrations.AddField(
model_name='mpoint',
name='can_manual',
field=models.BooleanField(default=False, verbose_name='是否允许手动录入'),
),
]

View File

@ -17,6 +17,7 @@ class Mpoint(CommonBModel):
mgroup = models.ForeignKey("mtm.mgroup", verbose_name="所在集合", on_delete=models.SET_NULL, null=True, blank=True)
mgroups_allocate = models.JSONField("各工段分配", default=list, blank=True, help_text='[{"mgroup":"x", "ratio": 1}]')
is_auto = models.BooleanField("是否自动采集", default=True)
can_manual = models.BooleanField("是否允许手动录入", default=False)
formula = models.TextField("计算公式", default="")
func_on_change = models.CharField("数据变动时执行方法", max_length=100, default="", blank=True) # 废弃字段暂时不用
interval = models.PositiveSmallIntegerField("采集间隔(秒)", default=10)

View File

@ -85,6 +85,8 @@ class MpointStatSerializer(CustomModelSerializer):
def validate(self, attrs):
mpoint = attrs["mpoint"]
if 'mgroup' not in attrs:
raise ParseError("请选择工段")
if mpoint.material and mpoint.is_auto is False and "sflog" in attrs and attrs["sflog"]:
attrs["type"] = "sflog"
sflog = attrs["sflog"]

View File

@ -25,7 +25,7 @@ class MpointViewSet(CustomModelViewSet):
queryset = Mpoint.objects.all()
serializer_class = MpointSerializer
select_related_fields = ["create_by", "belong_dept", "ep_monitored", "ep_belong", "mgroup"]
filterset_fields = ["belong_dept", "ep_monitored", "ep_belong", "mgroup", "is_auto", "mgroup__name", "val_type", "enabled"]
filterset_fields = ["belong_dept", "ep_monitored", "ep_belong", "mgroup", "is_auto", "mgroup__name", "val_type", "enabled", "can_manual"]
search_fields = ["name", "code"]
ordering = ["-create_time", "name", "code"]