diff --git a/hb_server/apps/wpm/views.py b/hb_server/apps/wpm/views.py index fc3653d..39a7b08 100644 --- a/hb_server/apps/wpm/views.py +++ b/hb_server/apps/wpm/views.py @@ -227,7 +227,7 @@ class WProductViewSet(ListModelMixin, GenericViewSet): if obj.is_testok: if wproduct.act_state == WProduct.WPR_ACT_STATE_TORETEST: wproduct.act_state = WProduct.WPR_ACT_STATE_DOWAIT # 复检 - elif wproduct.material.type == Material.MA_TYPE_GOOD: + 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 # 成品检验 else: wproduct.act_state = WProduct.WPR_ACT_STATE_OK