From 8eea8e956ec1ba34e3b1467126dfe0415e1b947f Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Tue, 1 Mar 2022 14:21:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=B9=E5=B1=82=E5=90=8E=E6=A3=80=E9=AA=8Cbu?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hb_server/apps/wpm/services.py | 8 +++++---
 hb_server/apps/wpm/views.py    | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/hb_server/apps/wpm/services.py b/hb_server/apps/wpm/services.py
index f836273..36db321 100644
--- a/hb_server/apps/wpm/services.py
+++ b/hb_server/apps/wpm/services.py
@@ -54,6 +54,10 @@ class WpmService(object):
             if wproduct.act_state == WProduct.WPR_ACT_STATE_TORETEST: # 复检
                 wproduct.act_state = WProduct.WPR_ACT_STATE_DOWAIT
             
+            elif wproduct.act_state == WProduct.WPR_ACT_STATE_TOTEST and \
+                    wproduct.subproduction_plan.subproduction.need_combtest : # 配置中需要质检
+                wproduct.act_state = WProduct.WPR_ACT_STATE_TOCOMBTEST
+                
             elif wproduct.act_state == WProduct.WPR_ACT_STATE_TOTEST and \
                 test.is_midtesting is True:
                 wproduct.act_state = WProduct.WPR_ACT_STATE_DOWAIT
@@ -62,9 +66,7 @@ class WpmService(object):
             elif wproduct.act_state == WProduct.WPR_ACT_STATE_TOTEST and wproduct.material.type == Material.MA_TYPE_GOOD: # 成品检验
                 wproduct.act_state = WProduct.WPR_ACT_STATE_TOFINALTEST 
             
-            elif wproduct.act_state == WProduct.WPR_ACT_STATE_TOTEST and \
-                    wproduct.subproduction_plan.subproduction.need_combtest : # 配置中需要质检
-                wproduct.act_state = WProduct.WPR_ACT_STATE_TOCOMBTEST
+            
             else:
                 wproduct.act_state = WProduct.WPR_ACT_STATE_OK
             if wproduct.number is None: # 产生半成品编号
diff --git a/hb_server/apps/wpm/views.py b/hb_server/apps/wpm/views.py
index 9bbb3c4..b2e6c3e 100644
--- a/hb_server/apps/wpm/views.py
+++ b/hb_server/apps/wpm/views.py
@@ -817,7 +817,7 @@ class OperationWproductViewSet(ListModelMixin, DestroyModelMixin, UpdateModelMix
             raise exceptions.APIException('该操作已提交')
         instance.delete()
         wp = instance.wproduct
-        wp.state = WProduct.WPR_ACT_STATE_DOWAIT
+        wp.act_state = WProduct.WPR_ACT_STATE_DOWAIT
         wp.operation = None
         wp.save()
         return Response()