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

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop

Browse Source
This commit is contained in:
jinling.yang
2024-07-30 10:19:16 +08:00
parent be3d4979b7 e1397f4b93
commit 599d2280f5
1 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sf_manufacturing/models/mrp_workorder.py
View File

@@ -910,6 +910,7 @@ class ResMrpWorkOrder(models.Model):
# if workorder.state not in ['cancel', 'rework']: # if workorder.state not in ['cancel', 'rework']:
# workorder.state = 'rework' # workorder.state = 'rework'
if workorder.routing_type == '装夹预调' and workorder.state in ['waiting', 'ready', 'pending']: if workorder.routing_type == '装夹预调' and workorder.state in ['waiting', 'ready', 'pending']:
if workorder.production_id.programming_state == '已编程':
# 当工单对应制造订单的功能刀具状态为 【无效刀】时，先对的第一个装夹预调工单状态设置为 【等待组件】 # 当工单对应制造订单的功能刀具状态为 【无效刀】时，先对的第一个装夹预调工单状态设置为 【等待组件】
if workorder.production_id.tool_state in ['1', '2']: if workorder.production_id.tool_state in ['1', '2']:
if workorder.state in ['ready']: if workorder.state in ['ready']: