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

Merge branch 'feature/优化工单_5' into feature/工单优化_1

Browse Source
This commit is contained in:
yuxianghui
2024-07-29 11:33:35 +08:00
parent 3c4286319f 639dd4e78d
commit c60b91c315
3 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
sf_manufacturing/models/mrp_production.py
View File

@@ -36,9 +36,11 @@ class MrpProduction(models.Model):
def _compute_tool_state_remark(self):
for item in self:
if item.workorder_ids:
workorder_ids = item.workorder_ids.filtered(lambda a: a.state not in ('rework', '返工'))
if workorder_ids.filtered(lambda a: a.tool_state_remark):
work_ids = workorder_ids.filtered(lambda a: a.tool_state == '1' and a.state not in ['rework'])
work_ids = []
for workorder_id in item.workorder_ids:
if workorder_id.tool_state == '1':
work_ids.append(workorder_id)
if work_ids:
tool_state_remark = ''
for work_id in work_ids:
if tool_state_remark == '':
@@ -54,10 +56,16 @@ class MrpProduction(models.Model):
for item in self:
if item.workorder_ids:
tool_state = item.tool_state
workorder_ids = item.workorder_ids.filtered(lambda a: a.state not in ('rework', '返工'))
if workorder_ids.filtered(lambda a: a.tool_state == '2'):
work_ids_1 = []
work_ids_2 = []
for workorder_id in item.workorder_ids:
if workorder_id.tool_state == '2':
work_ids_2.append(workorder_id)
elif workorder_id.tool_state == '1':
work_ids_1.append(workorder_id)
if work_ids_2:
item.tool_state = '2'
elif workorder_ids.filtered(lambda a: a.tool_state == '1'):
elif work_ids_1:
item.tool_state = '1'
else:
item.tool_state = '0'

2
sf_manufacturing/models/mrp_workorder.py
View File

@@ -194,7 +194,7 @@ class ResMrpWorkOrder(models.Model):
for cnc_id in cnc_ids:
if cnc_id.cutting_tool_name not in tool_state_remark:
tool_state_remark.append(cnc_id.cutting_tool_name)
item.tool_state_remark = f"{item.processing_panel}缺刀：{tool_state_remark}]"
item.tool_state_remark = f"{item.processing_panel}缺刀：{tool_state_remark}"
else:
item.tool_state_remark = None

11
sf_tool_management/models/functional_tool.py
View File

@@ -263,8 +263,17 @@ class FunctionalCuttingToolEntity(models.Model):
if self.tool_name_id.name:
cnc_processing_ids = self.env['sf.cnc.processing'].search(
[('tool_state', '=', '1'), ('cutting_tool_name', '=', self.tool_name_id.name)])
production_ids = []
if cnc_processing_ids:
cnc_processing_ids.sudo().write({'tool_state': '0'})
for item in cnc_processing_ids:
if item.workorder_id and item.workorder_id.production_id not in production_ids:
production_ids.append(item.workorder_id.production_id)
if production_ids:
# 对同一制造订单的工单的cnc编程单的功能刀具状态进行变更，并调用工单的功能刀具状态计算方法
for production_id in production_ids:
cnc_ids = cnc_processing_ids.filtered(lambda a: a.workorder_id.production_id == production_id)
cnc_ids.sudo().write({'tool_state': '0'})
cnc_ids.workorder_id._compute_tool_state()
def tool_inventory_displacement_out(self):
"""