1、重构工单cnc编程用刀校验方法;制造订单、工单、cnc编程单添加刀具状态字段,并且根据cnc编程单刀具状态自动计算制造订单、工单刀具状态字段的值;制造订单form页新增展示功能刀具状态字段;2、功能刀具拆解单刀具物料选择目标货位添加过滤添加为只选择所属货区是刀具房的货位;
This commit is contained in:
@@ -10,6 +10,8 @@ class CNCprocessing(models.Model):
|
||||
_inherit = 'sf.cnc.processing'
|
||||
_description = 'CNC加工用刀检测'
|
||||
|
||||
tool_state = fields.Selection([('0', '正常'), ('1', '缺刀'), ('2', '无效刀')], string='刀具状态', default='0')
|
||||
|
||||
# ==========MES装刀指令接口==========
|
||||
# def register_cnc_processing(self, knife_plan):
|
||||
# config = self.env['res.config.settings'].get_values()
|
||||
@@ -29,13 +31,66 @@ class CNCprocessing(models.Model):
|
||||
# else:
|
||||
# raise ValidationError("MES装刀指令发送失败")
|
||||
|
||||
def cnc_tool_checkout(self, cnc_processing_ids):
|
||||
"""
|
||||
根据传入的工单信息,查询是否有需要的功能刀具,如果没有则生成CAM工单程序用刀计划
|
||||
"""
|
||||
cam_id = self.env['sf.cam.work.order.program.knife.plan']
|
||||
production_ids = [] # 制造订单集
|
||||
datas = {} # 缺刀/无效刀集
|
||||
for cnc_processing in cnc_processing_ids:
|
||||
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: {}})
|
||||
production_ids.append(cnc_processing.production_id)
|
||||
if not datas.get(production_name).get(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)
|
||||
cnc_processing.tool_state = '2'
|
||||
# todo 无效刀处理逻辑
|
||||
|
||||
# 跳过本次循环
|
||||
continue
|
||||
# 校验CNC用刀在系统是否存在
|
||||
functional_tools = self.env['sf.functional.cutting.tool.entity'].sudo().search(
|
||||
[('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)
|
||||
cnc_processing.tool_state = '1'
|
||||
# 判断是否有满足条件的刀
|
||||
if not functional_tools:
|
||||
# 创建CAM申请装刀记录
|
||||
cam_id.create_cam_work_plan(cnc_processing)
|
||||
logging.info('成功调用CAM工单程序用刀计划创建方法!!!')
|
||||
for production_id in production_ids:
|
||||
if production_id:
|
||||
data = datas.get(production_id.name)
|
||||
tool_state_remark = ''
|
||||
# todo 对无效刀信息进行处理
|
||||
|
||||
# 对缺刀信息进行处理
|
||||
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':
|
||||
production_id.write({
|
||||
'tool_state_remark': tool_state_remark
|
||||
})
|
||||
|
||||
@api.model_create_multi
|
||||
def create(self, vals):
|
||||
obj = super(CNCprocessing, self).create(vals)
|
||||
for item in obj:
|
||||
# 调用CAM工单程序用刀计划创建方法
|
||||
self.env['sf.cam.work.order.program.knife.plan'].create_cam_work_plan(item)
|
||||
logging.info('成功调用CAM工单程序用刀计划创建方法!!!')
|
||||
# 调用CAM工单程序用刀计划创建方法
|
||||
self.cnc_tool_checkout(obj)
|
||||
return obj
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user