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:
mgw
2024-12-26 14:47:20 +08:00
parent 07356b5bb2 96c79a78ab
commit 9ac60ae283
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sf_manufacturing/models/mrp_production.py
View File

@@ -372,14 +372,10 @@ class MrpProduction(models.Model):
if any(dr.test_results == '报废' and dr.handle_result == '已处理' for dr in if any(dr.test_results == '报废' and dr.handle_result == '已处理' for dr in
production.detection_result_ids): production.detection_result_ids):
production.state = 'cancel' production.state = 'cancel'
# 如果制造订单的功能刀具为【无效刀】则制造订单状态改为返工
if production.tool_state == '2':
production.state = 'rework'
if production.workorder_ids and all(wo_state in ('done', 'rework', 'cancel') for wo_state in production.workorder_ids.mapped('state')): if production.workorder_ids and all(wo_state in ('done', 'rework', 'cancel') for wo_state in production.workorder_ids.mapped('state')):
if production.state not in ['scrap', 'rework', 'cancel']: if production.state not in ['scrap', 'rework', 'cancel']:
production.state = 'done' production.state = 'done'
# 退回调整 # 退回调整
def technology_back_adjust(self): def technology_back_adjust(self):
process_parameters = [] process_parameters = []

4
sf_tool_management/models/mrp_workorder.py
View File

@@ -198,8 +198,8 @@ class MrpProduction(models.Model):
logging.info('cnc用刀校验到无效刀自动调用重新编程方法：update_programming_state()') logging.info('cnc用刀校验到无效刀自动调用重新编程方法：update_programming_state()')
self[0].update_programming_state() self[0].update_programming_state()
self[0].write({'is_rework': False}) self[0].write({'is_rework': False})
# 修改制造订单 编程状态变为“编程中” 制造订单状态为‘返工’ # 修改制造订单 编程状态变为“编程中”
self.write({'programming_state': '编程中', 'work_state': '编程中', 'state': 'rework'}) self.write({'programming_state': '编程中', 'work_state': '编程中'})
self[0].workorder_ids.filtered( self[0].workorder_ids.filtered(
lambda a: a.name == '装夹预调' and a.state not in ['rework', 'done', 'cancel'])._compute_state() lambda a: a.name == '装夹预调' and a.state not in ['rework', 'done', 'cancel'])._compute_state()
if missing_tool_1: if missing_tool_1: