From 5b04858d2e7777f57d65df3526cdc5302422bee5 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 10 Feb 2023 12:21:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=90=AF=E4=BD=9C=E4=B8=9A=E7=9B=91?=
 =?UTF-8?q?=E6=8E=A7=E5=89=8D=E5=85=B3=E9=97=AD=E5=8F=AF=E8=83=BD=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A8=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/opm/services.py | 5 +++++
 apps/opm/views.py    | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/opm/services.py b/apps/opm/services.py
index aa3ccbfb..adefa884 100644
--- a/apps/opm/services.py
+++ b/apps/opm/services.py
@@ -103,6 +103,11 @@ def opl_start(ticket: Ticket):
 
 
 def start_mtask(opl: Opl):
+    if opl.mtask_uid:
+        # 先关闭
+        close_mtask(opl.mtask_uid)
+        opl.mtask_uid = None
+        opl.save()
     op = opl.operation
     mtask_uid = None
     vc_codes = []
diff --git a/apps/opm/views.py b/apps/opm/views.py
index def46227..81b63cfa 100644
--- a/apps/opm/views.py
+++ b/apps/opm/views.py
@@ -111,11 +111,6 @@ class OplViewSet(CustomModelViewSet):
         开启作业监控
         """
         obj = self.get_object()
-        if obj.mtask_uid:
-            # 先关闭
-            close_mtask(obj.mtask_uid)
-            obj.mtask_uid = None
-            obj.save()
         res = start_mtask(obj)
         return Response(res)