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

Merge branch 'feature/制造订单状态优化' into feature/工单状态优化_2

Browse Source
This commit is contained in:
yuxianghui
2024-11-28 15:09:51 +08:00
parent 5d3d04b5d3 8ff73d5647
commit d741d6ccf5
2 changed files with 36 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sf_manufacturing/models/mrp_workorder.py
View File

@@ -1097,8 +1097,7 @@ class ResMrpWorkOrder(models.Model):
# ================= 如果制造订单刀具状态为[无效刀、缺刀] 或者 制造订单状态为[返工]==========================
if (workorder.production_id.tool_state in ['1', '2'] or workorder.production_id.state == 'rework'
or workorder.production_id.schedule_state != '已排'
or len(
workorder.production_id.picking_ids.filtered(lambda w: w.state not in ['done', 'cancel'])) != 0
or workorder.production_id.reservation_state not in ['assigned']
or workorder.production_id.workorder_ids.filtered(
lambda wk: wk.sequence == workorder.sequence - 1).test_results in ['报废', '返工']):
if workorder.state != 'waiting':