From 7a3c46c8f1a6952a4fd7e03f586e17185f5471df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com>
Date: Tue, 27 Sep 2022 16:35:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BF=E9=97=AE=E9=A1=B9=E7=9B=AE=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=85=B6=E4=BB=96/=E4=BD=9C=E4=B8=9A=E7=9B=91?=
 =?UTF-8?q?=E6=8E=A7=E4=BB=BB=E5=8A=A1=E5=81=9C=E6=AD=A2=E6=97=B6=E5=B0=86?=
 =?UTF-8?q?mtask=E7=BD=AE=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/ecm/tasks.py                              |  2 ++
 apps/opm/services.py                           |  2 ++
 apps/opm/views.py                              |  2 ++
 apps/vm/migrations/0004_alter_visit_purpose.py | 18 ++++++++++++++++++
 apps/vm/models.py                              |  3 ++-
 5 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 apps/vm/migrations/0004_alter_visit_purpose.py

diff --git a/apps/ecm/tasks.py b/apps/ecm/tasks.py
index 5cc2b885..bf4a133a 100644
--- a/apps/ecm/tasks.py
+++ b/apps/ecm/tasks.py
@@ -90,3 +90,5 @@ def opl_task(vc_codes: list, opl_id: str):
         for i in vchannels:
             Thread(target=snap_and_analyse, args=(i, algo_codes, opl)).start()
         time.sleep(10)
+    opl.mtask = None
+    opl.save()
diff --git a/apps/opm/services.py b/apps/opm/services.py
index 80890015..270201a6 100644
--- a/apps/opm/services.py
+++ b/apps/opm/services.py
@@ -134,6 +134,8 @@ def opl_end(ticket: Ticket):
     if opl.mtask:
         # 关闭作业视频监控任务
         close_mtask(opl.mtask.task_id)
+        opl.mtask = None
+        opl.save()
     operation = opl.operation
     opls = Opl.objects.filter(operation=operation)
     opls.filter(ticket=None).delete()  # 删除无用许可证
diff --git a/apps/opm/views.py b/apps/opm/views.py
index b236a2f1..e138aeb3 100644
--- a/apps/opm/views.py
+++ b/apps/opm/views.py
@@ -106,6 +106,8 @@ class OplViewSet(CustomModelViewSet):
             # 防止没变化，手动处理一下
             mtask.status = 'REVOKED'
             mtask.save()
+            obj.mtask = None
+            obj.save()
         return Response()
 
 
diff --git a/apps/vm/migrations/0004_alter_visit_purpose.py b/apps/vm/migrations/0004_alter_visit_purpose.py
new file mode 100644
index 00000000..f55b6226
--- /dev/null
+++ b/apps/vm/migrations/0004_alter_visit_purpose.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.12 on 2022-09-27 05:37
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('vm', '0003_auto_20220901_1517'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='visit',
+            name='purpose',
+            field=models.PositiveSmallIntegerField(choices=[(10, '参观'), (20, '拜访'), (30, '面试'), (40, '开会'), (50, '拉送货'), (60, '其他')], verbose_name='来访事由'),
+        ),
+    ]
diff --git a/apps/vm/models.py b/apps/vm/models.py
index 344ae25d..6cd61666 100644
--- a/apps/vm/models.py
+++ b/apps/vm/models.py
@@ -16,7 +16,8 @@ class Visit(CommonBDModel):
         (20, '拜访'),
         (30, '面试'),
         (40, '开会'),
-        (50, '拉送货')
+        (50, '拉送货'),
+        (60, '其他')
     )
     V_CREATE = 10
     V_AUDIT = 20