jikimo/jikimo_sf
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/修复返工-cmm

Browse Source
This commit is contained in:
jinling.yang
2024-07-29 16:42:13 +08:00
parent 9c47a6bdba f0a887887e
commit d2d5702125
4 changed files with 35 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
sf_manufacturing/models/mrp_production.py
View File

@@ -36,12 +36,17 @@ 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_remark)
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:
tool_state_remark = f"{work_id.tool_state_remark}\n"
if tool_state_remark == '':
tool_state_remark = f"{work_id.tool_state_remark}"
else:
tool_state_remark = f"{tool_state_remark}\n{work_id.tool_state_remark}"
item.tool_state_remark = tool_state_remark
else:
item.tool_state_remark = False
@@ -51,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'

10
sf_manufacturing/models/mrp_workorder.py
View File

@@ -189,11 +189,12 @@ class ResMrpWorkOrder(models.Model):
if item.cnc_ids.filtered(lambda a: a.tool_state == '2'):
item.tool_state_remark = None
elif item.cnc_ids.filtered(lambda a: a.tool_state == '1'):
tool_state_remark = f'{item.processing_panel}缺刀：['
tool_state_remark = []
cnc_ids = item.cnc_ids.filtered(lambda a: a.tool_state == '1')
for cnc_id in cnc_ids:
tool_state_remark = f"{tool_state_remark}'{cnc_id.cutting_tool_name}'"
item.tool_state_remark = f"{tool_state_remark}]"
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}"
else:
item.tool_state_remark = None
@@ -820,7 +821,8 @@ class ResMrpWorkOrder(models.Model):
}]
return workorders_values_str
@api.depends('production_availability', 'blocked_by_workorder_ids', 'blocked_by_workorder_ids.state')
@api.depends('production_availability', 'blocked_by_workorder_ids', 'blocked_by_workorder_ids.state',
'production_id.tool_state')
def _compute_state(self):
super()._compute_state()
for workorder in self: