jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、处理制造订单返工确认后，状态还是返工的bug；2、隐藏已取消状态的采购单【确认订单】按钮

Browse Source
This commit is contained in:
yuxianghui
2024-12-25 13:02:49 +08:00
parent 32fb6eadbc
commit 7f17ff8b78
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sf_manufacturing/models/mrp_production.py
View File

@@ -363,15 +363,10 @@ class MrpProduction(models.Model):
# if production.state == 'pending_cam':
# if all(wo_state in 'done' for wo_state in production.workorder_ids.mapped('state')):
# production.state = 'done'
if any(
(
wo.test_results == '返工' and wo.state == 'done' and production.programming_state in [
'已编程']) or (
wo.state == 'rework' and production.programming_state == '编程中') or (
wo.is_rework is True and wo.state == 'done' and production.programming_state in ['编程中',
'已编程'])
for wo in
production.workorder_ids):
if any((wo.test_results == '返工' and wo.state == 'done' and production.programming_state in ['已编程'])
or (wo.state == 'rework' and production.programming_state == '编程中')
or (wo.is_rework is True and wo.state == 'done' and production.programming_state in ['编程中', '已编程'])
for wo in production.workorder_ids) and production.state not in ['progress']:
production.state = 'rework'
if any(wo.test_results == '报废' and wo.state == 'done' for wo in production.workorder_ids):
production.state = 'scrap'