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

Merge branch 'feature/刀具拆解单优化' into feature/工单优化

Browse Source
This commit is contained in:
yuxianghui
2024-09-18 09:30:49 +08:00
parent fbce132173 6a674cdb5b
commit 5d870d53f6
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sf_manufacturing/models/mrp_workorder.py
View File

@@ -1035,6 +1035,10 @@ class ResMrpWorkOrder(models.Model):
elif workorder.production_id.reservation_state != 'assigned': elif workorder.production_id.reservation_state != 'assigned':
workorder.state = 'waiting' workorder.state = 'waiting'
continue continue
elif (workorder.name == '装夹预调' and
workorder.state not in ['rework', 'done', 'cancel']):
if workorder.state != 'pending':
workorder.state = 'pending'
if workorder.production_id.tool_state in ['1', '2'] and workorder.state == 'ready': if workorder.production_id.tool_state in ['1', '2'] and workorder.state == 'ready':
workorder.state = 'waiting' workorder.state = 'waiting'
continue continue