diff --git a/hb_server/apps/wpm/models.py b/hb_server/apps/wpm/models.py index a78c6ee..78e3a3f 100644 --- a/hb_server/apps/wpm/models.py +++ b/hb_server/apps/wpm/models.py @@ -139,7 +139,7 @@ class WProduct(CommonAModel): @property def last_wp_test(self): """ - 最后提交的本产品自检 + 最后提交的本产品工序自检 """ return self.test_wproduct.filter(is_submited=True).order_by('-id').first() diff --git a/hb_server/apps/wpm/views.py b/hb_server/apps/wpm/views.py index d448544..c20918c 100644 --- a/hb_server/apps/wpm/views.py +++ b/hb_server/apps/wpm/views.py @@ -707,7 +707,7 @@ class OperationViewSet(ListModelMixin, RetrieveModelMixin, CreateModelMixin, Upd if step == newstep: wp.act_state = WProduct.WPR_ACT_STATE_TOTEST - last_test = wp.last_wp_test + last_test = wp.last_process_test if last_test and reuseForm: last_test.is_midtesting = False last_test.is_submited = False @@ -718,7 +718,7 @@ class OperationViewSet(ListModelMixin, RetrieveModelMixin, CreateModelMixin, Upd wp.act_state = WProduct.WPR_ACT_STATE_DOWAIT if needTest: #子工序若需要检验 wp.act_state = WProduct.WPR_ACT_STATE_TOTEST - last_test = wp.last_wp_test + last_test = wp.last_process_test if last_test and reuseForm: last_test.is_midtesting = True last_test.is_submited = False @@ -770,7 +770,7 @@ class OperationViewSet(ListModelMixin, RetrieveModelMixin, CreateModelMixin, Upd wproduct.subproduction_plan = oms_w.subproduction_plan if step == newstep: wproduct.act_state = WProduct.WPR_ACT_STATE_TOTEST - last_test = wproduct.last_wp_test + last_test = wproduct.last_process_test if last_test and reuseForm: last_test.is_midtesting = False last_test.is_submited = False @@ -781,7 +781,7 @@ class OperationViewSet(ListModelMixin, RetrieveModelMixin, CreateModelMixin, Upd wproduct.act_state = WProduct.WPR_ACT_STATE_DOWAIT if needTest: wproduct.act_state = WProduct.WPR_ACT_STATE_TOTEST - last_test = wproduct.last_wp_test + last_test = wproduct.last_process_test if last_test and reuseForm: last_test.is_midtesting = True last_test.is_submited = False