From 408bb37b67901c3fa2345dccd5360e3508f04f4a Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 29 Apr 2024 14:43:45 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20is=5Fruning=E5=AD=97=E6=AE=B5=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/em/services.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/apps/em/services.py b/apps/em/services.py index 7e07d8df..19867949 100644 --- a/apps/em/services.py +++ b/apps/em/services.py @@ -44,7 +44,6 @@ def shutdown_or_startup(equipId: str, last_timex: datetime, last_mrs): equip.save(update_fields=["running_state"]) mgroup: Mgroup = equip.mgroup - old_run = mgroup.is_runing indicate = equip.indicate_mgroup_running new_run = None @@ -62,9 +61,9 @@ def shutdown_or_startup(equipId: str, last_timex: datetime, last_mrs): if not Equipment.objects.filter(mgroup=mgroup, indicate_mgroup_running=indicate, running_state__in=[Equipment.STOP, Equipment.FAILURE, Equipment.STANDBY]).exists(): new_run = True - if new_run is not None and new_run != old_run: - mgroup.is_runing = new_run - mgroup.save(update_fields=["is_runing"]) + if new_run is not None: + mgroup.is_running = new_run + mgroup.save(update_fields=["is_running"]) last_stlog = StLog.objects.filter(mgroup=mgroup, is_shutdown=True).order_by("-start_time").first() # 找到最后一次停机记录 @@ -79,7 +78,7 @@ def shutdown_or_startup(equipId: str, last_timex: datetime, last_mrs): StLog.objects.create(title="停机", is_shutdown=True, mgroup=mgroup, end_time=None, start_time=last_timex, sflog=get_sflog(mgroup, last_timex)) elif new_run is False: StLog.objects.create(title="停机", is_shutdown=True, mgroup=mgroup, end_time=None, start_time=last_timex, sflog=get_sflog(mgroup, last_timex)) - mgroup.is_runing = False + mgroup.is_running = False mgroup.save()