zcdsj
/
hberp
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

最后提交的本产品本工序自检 bug

This commit is contained in:
曹前明 2022-06-29 11:33:09 +08:00
parent 0fb897d75b
commit 4024fee865
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hb_server/apps/wpm/models.py
View File

@ -139,9 +139,9 @@ class WProduct(CommonAModel):
@property
def last_wp_test(self):
"""
最后提交的本产品工序自检
最后提交的本产品本工序自检
"""
return self.test_wproduct.filter(is_submited=True).order_by('-id').first()
return self.test_wproduct.filter(is_submited=True, type=TestRecord.TEST_PROCESS, subproduction_plan=self.subproduction_plan).order_by('-id').first()
class WprouctTicket(CommonAModel):

10
hb_server/apps/wpm/views.py
View File

@ -203,7 +203,7 @@ class WProductViewSet(ListModelMixin, RetrieveModelMixin, GenericViewSet):
form=form)
if wproduct.act_state == WProduct.WPR_ACT_STATE_TORETEST:
# 查找最近一条检验记录
trs = wproduct.last_process_test
trs = wproduct.last_wp_test
savedict['origin_test'] = trs
if not trs:
raise exceptions.APIException('原工序检验记录不存在')
@ -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_process_test
last_test = wp.last_wp_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_process_test
last_test = wp.last_wp_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_process_test
last_test = wproduct.last_wp_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_process_test
last_test = wproduct.last_wp_test
if last_test and reuseForm:
last_test.is_midtesting = True
last_test.is_submited = False