1、cnc编程单tree视图展示刀具状态字段；2、优化制造订单的功能刀具状态字段自动更新方法，同时当工单刀具状态变化时变更缺刀备注信息，添加状态为无效刀的备注字段；3、优化当功能刀具从【刀具房】到【制造前】时进行校验，校验是否为制造订单所缺的刀，如果是则修改cnc编程单刀具状态为正常；4、优化cnc用刀校验：添加对无效刀的处理(无效刀时触发返工流程，并生成检测结果数据)，优化生成的待处理数据的数据结构；
This commit is contained in:
yuxianghui
@@ -35,24 +35,29 @@ class CNCprocessing(models.Model):
|
||||
"""
|
||||
cam_id = self.env['sf.cam.work.order.program.knife.plan']
|
||||
production_ids = [] # 制造订单集
|
||||
datas = {} # 缺刀/无效刀集
|
||||
datas = {'缺刀': {}, '无效刀': {}} # 缺刀/无效刀集
|
||||
for cnc_processing in cnc_processing_ids:
|
||||
# ======创建字典: {'缺刀': {'制造订单1': {'加工面1': [], ...}, ...}, '无效刀': {'制造订单1': {'加工面1': [], ...}, ...}}======
|
||||
production_name = cnc_processing.production_id.name # 制造订单
|
||||
processing_panel = cnc_processing.workorder_id.processing_panel # 加工面
|
||||
if not datas.get(production_name):
|
||||
datas.update({production_name: {}})
|
||||
if production_name not in list(datas['缺刀'].keys()):
|
||||
datas['缺刀'].update({production_name: {processing_panel: []}})
|
||||
datas['无效刀'].update({production_name: {processing_panel: []}})
|
||||
production_ids.append(cnc_processing.production_id)
|
||||
if not datas.get(production_name).get(processing_panel):
|
||||
datas.get(production_name).update({processing_panel: {'缺刀': [], '无效刀': []}})
|
||||
else:
|
||||
if processing_panel not in list[datas['缺刀'].get(production_name).keys()]:
|
||||
datas['缺刀'].get(production_name).update({processing_panel: []})
|
||||
datas['无效刀'].get(production_name).update({processing_panel: []})
|
||||
# ======================================
|
||||
if cnc_processing.cutting_tool_name:
|
||||
tool_name = cnc_processing.cutting_tool_name
|
||||
# 检验CNC用刀是否是功能刀具清单中的刀具
|
||||
tool_inventory_id = self.env['sf.tool.inventory'].sudo().search([('name', '=', tool_name)])
|
||||
if not tool_inventory_id:
|
||||
datas[production_name][processing_panel]['无效刀'].append(cnc_processing.cutting_tool_name)
|
||||
if cnc_processing.cutting_tool_name not in datas['无效刀'][production_name][processing_panel]:
|
||||
datas['无效刀'][production_name][processing_panel].append(cnc_processing.cutting_tool_name)
|
||||
cnc_processing.tool_state = '2'
|
||||
# todo 无效刀处理逻辑
|
||||
|
||||
logging.info(f'"无效刀"：[{production_name}、{processing_panel}、{cnc_processing.cutting_tool_name}]')
|
||||
# 跳过本次循环
|
||||
continue
|
||||
# 校验CNC用刀在系统是否存在
|
||||
@@ -60,28 +65,62 @@ class CNCprocessing(models.Model):
|
||||
[('tool_name_id', '=', tool_inventory_id.id), ('functional_tool_status', '=', '正常')])
|
||||
# 判断线边、机内是否有满足条件的刀
|
||||
if not functional_tools.filtered(lambda p: p.current_location in ('线边刀库', '机内刀库')):
|
||||
datas[production_name][processing_panel]['缺刀'].append(cnc_processing.cutting_tool_name)
|
||||
if cnc_processing.cutting_tool_name not in datas['缺刀'][production_name][processing_panel]:
|
||||
datas['缺刀'][production_name][processing_panel].append(cnc_processing.cutting_tool_name)
|
||||
cnc_processing.tool_state = '1'
|
||||
logging.info(f'"缺刀"：[{production_name}、{processing_panel}、{cnc_processing.cutting_tool_name}]')
|
||||
# 判断是否有满足条件的刀
|
||||
if not functional_tools:
|
||||
# 创建CAM申请装刀记录
|
||||
cam_id.create_cam_work_plan(cnc_processing)
|
||||
logging.info('成功调用CAM工单程序用刀计划创建方法！！！')
|
||||
logging.info(datas)
|
||||
for production_id in production_ids:
|
||||
if production_id:
|
||||
data = datas.get(production_id.name)
|
||||
tool_state_remark = ''
|
||||
# todo 对无效刀信息进行处理
|
||||
|
||||
data1 = datas['无效刀'].get(production_id.name) # data1: {'加工面1': [], ...}
|
||||
data2 = datas['缺刀'].get(production_id.name) # data2: {'加工面1': [], ...}
|
||||
tool_state_remark1 = ''
|
||||
tool_state_remark2 = ''
|
||||
# 对无效刀信息进行处理
|
||||
for key in data1:
|
||||
if data1.get(key):
|
||||
if tool_state_remark1 != '':
|
||||
tool_state_remark1 = f'{tool_state_remark1}\n{key}无效刀:{data1.get(key)}'
|
||||
else:
|
||||
tool_state_remark1 = f'{key}无效刀:{data1.get(key)}'
|
||||
# 无效刀处理逻辑
|
||||
# 1、创建制造订单无效刀检测结果记录
|
||||
production_id.detection_result_ids.create({
|
||||
'production_id': production_id.id,
|
||||
'processing_panel': key,
|
||||
'routing_type': 'CNC加工',
|
||||
'rework_reason': 'programming', # 原因：编程(programming)
|
||||
'detailed_reason': '无效功能刀具',
|
||||
'test_results': '返工',
|
||||
'handle_result': '待处理'
|
||||
})
|
||||
# 2、将制造订单状态改为返工
|
||||
production_id.write({
|
||||
'state': 'rework'
|
||||
})
|
||||
# 对缺刀信息进行处理
|
||||
for key in data:
|
||||
if tool_state_remark != '':
|
||||
tool_state_remark = f'{tool_state_remark}\n{key}缺刀：{data.get(key).get("缺刀")}'
|
||||
else:
|
||||
tool_state_remark = f'{key}缺刀：{data.get(key).get("缺刀")}'
|
||||
if production_id.tool_state == '1':
|
||||
if tool_state_remark1 == '':
|
||||
for key in data2:
|
||||
if data2.get(key) and not data1.get(key):
|
||||
if tool_state_remark2 != '':
|
||||
tool_state_remark2 = f'{tool_state_remark2}\n{key}缺刀：{data2.get(key)}'
|
||||
else:
|
||||
tool_state_remark2 = f'{key}缺刀：{data2.get(key)}'
|
||||
# 将备注信息存入制造订单功能刀具状态的备注字段
|
||||
if production_id.tool_state_remark2 == '':
|
||||
production_id.write({
|
||||
'tool_state_remark': tool_state_remark
|
||||
'tool_state_remark': tool_state_remark2,
|
||||
'tool_state_remark2': tool_state_remark1
|
||||
})
|
||||
else:
|
||||
production_id.write({
|
||||
'tool_state_remark': tool_state_remark2,
|
||||
'tool_state_remark2': f'{production_id.tool_state_remark1}\n{tool_state_remark1}'
|
||||
})
|
||||
|
||||
@api.model_create_multi
|
||||
|
||||
Reference in New Issue
Block a user