Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复工单完成接口

This commit is contained in:
jinling.yang
2024-07-01 18:28:11 +08:00
2 changed files with 7 additions and 2 deletions

View File

@@ -111,11 +111,16 @@ class MrpProduction(models.Model):
production.state = 'progress'
# # 新添加的状态逻辑
if production.state == 'to_close' and production.schedule_state == '未排':
if (production.state == 'to_close' or production.state == 'progress') and production.schedule_state == '未排':
production.state = 'confirmed'
elif production.state == 'to_close' and production.schedule_state == '已排':
production.state = 'pending_cam'
if production.state == 'progress':
if all(wo_state not in ('progress', 'done') for wo_state in production.workorder_ids.mapped('state')):
production.state = 'pending_cam'
def action_check(self):
"""
审核启用