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 feature/修复工单完成接口

Browse Source
This commit is contained in:
jinling.yang
2024-07-01 18:28:11 +08:00
parent e9c9b77112 8a97fd08e2
commit d69dc20fd1
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_bf_connect/models/jd_eclp.py
View File

@@ -175,7 +175,7 @@ class JdEclp(models.Model):
'type': 'success', 'type': 'success',
'message': '物流下单成功', 'message': '物流下单成功',
'sticky': False, 'sticky': False,
'next': {'type': 'ir.actions.client', 'tag': 'soft_reload'} 'next': {'type': 'ir.actions.client', 'tag': 'reload'}
} }
} }

7
sf_manufacturing/models/mrp_production.py
View File

@@ -111,11 +111,16 @@ class MrpProduction(models.Model):
production.state = 'progress' 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' production.state = 'confirmed'
elif production.state == 'to_close' and production.schedule_state == '已排': elif production.state == 'to_close' and production.schedule_state == '已排':
production.state = 'pending_cam' 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): def action_check(self):
""" """
审核启用 审核启用