1、功能刀具列表模型新增大量字段,新增计算库存数量方法,新增查看当前功能刀具的预警记录按键;2、重构功能刀具预警模型(已完成);3、功能刀具组装模型name字段展示内容改为功能刀具名称;

This commit is contained in:
yuxianghui
2023-11-22 17:19:25 +08:00
parent 8a1dfe14e6
commit 83da8f58e2
6 changed files with 270 additions and 433 deletions

View File

@@ -1,3 +1,2 @@
from . import base
from . import tool_material_search

View File

@@ -19,9 +19,9 @@ class FunctionalCuttingToolEntity(models.Model):
name = fields.Char(related='functional_tool_name_id.name')
functional_tool_name_id = fields.Many2one('sf.functional.tool.assembly', string='功能刀具名称', readonly=True)
barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True)
mrs_cutting_tool_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀具型号')
mrs_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型',
group_expand='_read_group_mrs_cutting_tool_type_id', compute_sudo=True)
sf_cutting_tool_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀具型号')
sf_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型',
group_expand='_read_group_mrs_cutting_tool_type_id', compute_sudo=True)
functional_tool_diameter = fields.Integer(string='刀具直径(mm)', readonly=True)
knife_tip_r_angle = fields.Float(string='刀尖R角(mm)', readonly=True)
@@ -30,14 +30,27 @@ class FunctionalCuttingToolEntity(models.Model):
tool_loading_length = fields.Float(string='装刀长(mm)', readonly=True)
functional_tool_length = fields.Float(string='伸出长(mm)', readonly=True)
effective_length = fields.Float(string='有效长(mm)', readonly=True)
tool_room_num = fields.Integer(string='刀具房数量')
line_edge_knife_library_num = fields.Integer(string='线边刀库数量')
machine_knife_library_num = fields.Integer(string='机内刀库数量')
tool_room_num = fields.Integer(string='刀具房数量', readonly=True, )
line_edge_knife_library_num = fields.Integer(string='线边刀库数量', readonly=True)
machine_knife_library_num = fields.Integer(string='机内刀库数量', readonly=True)
max_lifetime_value = fields.Integer(string='最大寿命值(min)', readonly=True)
alarm_value = fields.Integer(string='报警值(min)', readonly=True)
used_value = fields.Integer(string='已使用值(min)', readonly=True)
functional_tool_status = fields.Selection([('正常', '正常'), ('报警', '报警'), ('已拆除', '已拆除')],
string='状态', store=True, default='正常')
current_location_id = fields.Many2one('stock.location', string='当前位置', readonly=True)
image = fields.Binary('图片', readonly=True)
@api.depends('current_location_id')
def _compute_location_num(self):
"""
计算库存位置数量
"""
for obj in self:
if obj.current_location_id.name in ('组装后', '刀具房'):
obj.tool_room_num = 1
obj.line_edge_knife_library_num = 0
obj.machine_knife_library_num = 0
@api.model
def _read_group_mrs_cutting_tool_type_id(self, categories, domain, order):
@@ -47,64 +60,44 @@ class FunctionalCuttingToolEntity(models.Model):
# 整体式刀具型号
cutting_tool_integral_model_id = fields.Many2one('product.product', string='整体式刀具型号', readonly=True,
domain=[('cutting_tool_material_id', '=', '整体式刀具')])
# 刀片型号
cutting_tool_blade_model_id = fields.Many2one('product.product', string='刀片型号', readonly=True,
domain=[('cutting_tool_material_id', '=', '刀片')])
# 刀杆型号
cutting_tool_cutterbar_model_id = fields.Many2one('product.product', string='刀杆型号', readonly=True,
domain=[('cutting_tool_material_id', '=', '刀杆')])
# 刀盘型号
cutting_tool_cutterpad_model_id = fields.Many2one('product.product', string='刀盘型号', readonly=True,
domain=[('cutting_tool_material_id', '=', '刀盘')])
# 刀柄型号
cutting_tool_cutterhandle_model_id = fields.Many2one('product.product', string='刀柄型号', readonly=True,
domain=[('cutting_tool_material_id', '=', '刀柄')])
# 夹头型号
cutting_tool_cutterhead_model_id = fields.Many2one('product.product', string='夹头型号', readonly=True,
domain=[('cutting_tool_material_id', '=', '夹头')])
diameter = fields.Float('直径(mm)')
tool_grade = fields.Selection([('1', 'P1'), ('2', 'P2'), ('3', 'P3'), ('4', 'P4'), ('5', 'P5'), ('6', 'P6')],
string='刀具等级')
machining_accuracy = fields.Float('加工精度(mm)')
tool_length = fields.Float('装刀长(mm)')
blade_number = fields.Integer('刃数')
integral_blade_length = fields.Float('整体刃长(mm)')
effective_blade_length = fields.Float('有效刃长(mm)')
max_life = fields.Float('最大寿命值')
is_standard = fields.Selection([('1', ''), ('0', '')], '是否标准刀')
applicable_range = fields.Char('适用范围')
image = fields.Binary('图片')
whether_standard_knife = fields.Boolean(string='是否标准刀', default=True, readonly=True)
L_D_number = fields.Float(string='L/D值(mm)', readonly=True)
hiding_length = fields.Float(string='避空长(mm)', readonly=True)
cut_time = fields.Integer(string='已切削时间(min)', readonly=True)
cut_length = fields.Float(string='已切削长度(mm)', readonly=True)
cut_number = fields.Integer(string='已切削次数', readonly=True)
suitable_machining_method_ids = fields.Many2many('maintenance.equipment.image',
'rel_machining_product_template_tool_entity', '适合加工方式',
domain=[('type', '=', '加工能力')],
related='cutting_tool_integral_model_id.suitable_machining_method_ids')
blade_tip_characteristics_id = fields.Many2many('maintenance.equipment.image',
'rel_blade_tip_product_template_tool_entity', '刀尖特征',
domain=[('type', '=', '刀尖特征')],
related='cutting_tool_integral_model_id.blade_tip_characteristics_id')
handle_type_ids = fields.Many2many('maintenance.equipment.image',
'rel_handle_product_template_tool_entity', '柄部类型',
domain=[('type', '=', '柄部类型')],
related='cutting_tool_integral_model_id.handle_type_ids')
cutting_direction_ids = fields.Many2many('maintenance.equipment.image',
'rel_cutting_product_template_tool_entity', '走刀方向',
domain=[('type', '=', '走刀方向')],
related='cutting_tool_integral_model_id.cutting_direction_ids')
suitable_coolant_ids = fields.Many2many('maintenance.equipment.image',
'rel_coolant_product_template_tool_entity', '适合冷却液',
domain=[('type', '=', '冷却液')],
related='cutting_tool_integral_model_id.suitable_coolant_ids')
suitable_machining_method_ids = fields.Many2many(
'maintenance.equipment.image', 'rel_machining_product_template_tool_entity', '适合加工方式',
domain=[('type', '=', '加工能力')], related='cutting_tool_integral_model_id.suitable_machining_method_ids')
blade_tip_characteristics_id = fields.Many2many(
'maintenance.equipment.image', 'rel_blade_tip_product_template_tool_entity', '刀尖特征',
domain=[('type', '=', '刀尖特征')], related='cutting_tool_integral_model_id.blade_tip_characteristics_id')
handle_type_ids = fields.Many2many(
'maintenance.equipment.image', 'rel_handle_product_template_tool_entity', '柄部类型',
domain=[('type', '=', '柄部类型')], related='cutting_tool_integral_model_id.handle_type_ids')
cutting_direction_ids = fields.Many2many(
'maintenance.equipment.image', 'rel_cutting_product_template_tool_entity', '走刀方向',
domain=[('type', '=', '走刀方向')], related='cutting_tool_integral_model_id.cutting_direction_ids')
suitable_coolant_ids = fields.Many2many(
'maintenance.equipment.image', 'rel_coolant_product_template_tool_entity', '适合冷却液',
domain=[('type', '=', '冷却液')], related='cutting_tool_integral_model_id.suitable_coolant_ids')
def _get_functional_tool_model_ids(self, functional_tool_model_code):
functional_tool_model_ids = []
@@ -114,112 +107,48 @@ class FunctionalCuttingToolEntity(models.Model):
return [(6, 0, functional_tool_model_ids)]
def open_functional_tool_warning(self):
pass
action = self.env.ref('sf_tool_management.action_sf_functional_tool_warning')
result = action.read()[0]
result['domain'] = [('functional_tool_name_id', '=', self.functional_tool_name_id.id)]
return result
class FunctionalToolWarning(models.Model):
_name = 'sf.functional.tool.warning'
_description = '功能刀具预警'
functional_cutting_tool_id = fields.Many2one('sf.functional.cutting.tool.entity', '功能刀具', readonly=True)
functional_tool_assembly_id = fields.Many2one('sf.functional.tool.assembly', '功能刀具组装', readonly=True)
# code = fields.Char('编码', readonly=True, related='functional_cutting_tool_id.code')
barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True,
related='functional_cutting_tool_id.barcode_id')
name = fields.Char('名称', invisible=True, readonly=True, related='functional_cutting_tool_id.name')
functional_tool_name_id = fields.Many2one('product.product', string='功能刀具名称', readonly=True,
related='functional_cutting_tool_id.functional_tool_name_id')
mrs_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True,
related='functional_cutting_tool_id.mrs_cutting_tool_type_id')
# 整体式刀具型号
cutting_tool_integral_model_id = fields.Many2one('product.product', string='整体式刀具型号', readonly=True,
domain=[('cutting_tool_material_id', '=', '整体式刀具')],
related='functional_cutting_tool_id.cutting_tool_integral_model_id')
# 刀片型号
cutting_tool_blade_model_id = fields.Many2one('product.product', string='刀片型号', readonly=True,
domain=[('cutting_tool_material_id', '=', '刀片')],
related='functional_cutting_tool_id.cutting_tool_blade_model_id')
# 刀杆型号
cutting_tool_cutterbar_model_id = fields.Many2one('product.product', string='刀杆型号', readonly=True,
domain=[('cutting_tool_material_id', '=', '刀杆')],
related='functional_cutting_tool_id.cutting_tool_cutterbar_model_id')
# 刀盘型号
cutting_tool_cutterpad_model_id = fields.Many2one('product.product', string='刀盘型号', readonly=True,
domain=[('cutting_tool_material_id', '=', '刀盘')],
related='functional_cutting_tool_id.cutting_tool_cutterpad_model_id')
# 刀柄型号
cutting_tool_cutterhandle_model_id = fields.Many2one('product.product', string='刀柄型号', readonly=True,
domain=[('cutting_tool_material_id', '=', '刀柄')],
related='functional_cutting_tool_id.cutting_tool_cutterhandle_model_id')
# 夹头型号
cutting_tool_cutterhead_model_id = fields.Many2one('product.product', string='夹头型号', readonly=True,
domain=[('cutting_tool_material_id', '=', '夹头')],
related='functional_cutting_tool_id.cutting_tool_cutterhead_model_id')
diameter = fields.Float('直径(mm)', readonly=True, related='functional_cutting_tool_id.diameter')
tool_grade = fields.Selection([('1', 'P1'), ('2', 'P2'), ('3', 'P3'), ('4', 'P4'), ('5', 'P5'), ('6', 'P6')],
string='刀具等级', readonly=True, compute='_compute_functional_cutting_tool_id')
machining_accuracy = fields.Float('加工精度(mm)', readonly=True,
related='functional_cutting_tool_id.machining_accuracy')
# tool_length = fields.Float('装刀长', readonly=True, related='functional_cutting_tool_id.tool_length')
tool_length = fields.Float('装刀长(mm)', readonly=True, related='functional_cutting_tool_id.tool_length')
blade_number = fields.Integer('刃数', readonly=True, related='functional_cutting_tool_id.blade_number')
integral_blade_length = fields.Float('整体刃长(mm)', readonly=True,
related='functional_cutting_tool_id.integral_blade_length')
effective_blade_length = fields.Float('有效刃长(mm)', readonly=True,
related='functional_cutting_tool_id.effective_blade_length')
max_life = fields.Float('最大寿命值', readonly=True, related='functional_cutting_tool_id.max_life')
is_standard = fields.Selection([('1', ''), ('0', '')], '是否标准刀', readonly=True,
compute='_compute_functional_cutting_tool_id')
applicable_range = fields.Char('适用范围', readonly=True, related='functional_cutting_tool_id.applicable_range')
image = fields.Binary('图片', readonly=True, related='functional_cutting_tool_id.image')
install_tool_time = fields.Datetime("装刀时间", readonly=True,
related='functional_tool_assembly_id.tool_loading_time')
@api.depends('functional_cutting_tool_id')
def _compute_functional_cutting_tool_id(self):
if self.functional_cutting_tool_id:
self.tool_grade = self.functional_cutting_tool_id.tool_grade
self.is_standard = self.functional_cutting_tool_id.is_standard
# 功能刀具预警 特有字段
outbound_time = fields.Datetime('出库时间', readonly=True)
on_board_time = fields.Datetime('上机时间', readonly=False)
machine_table_name_id = fields.Many2one('maintenance.equipment', string='机床名称', readonly=True,
group_expand='_read_group_machine_table_name_ids')
name = fields.Char('名称', invisible=True, readonly=True, related='functional_tool_name_id.name')
# 机床信息
production_line_id = fields.Many2one('sf.production.line', string='生产线',
group_expand='_read_group_machine_table_name_ids')
maintenance_equipment_id = fields.Many2one('maintenance.equipment', string='CNC机床')
machine_tool_code = fields.Char(string='机台号')
machine_table_type_id = fields.Many2one('maintenance.equipment.category', string='机床类型')
cutter_spacing_code_id = fields.Many2one('maintenance.equipment.tool', string='刀位号',
domain="[('equipment_id', '=', maintenance_equipment_id)]")
# 功能刀具信息
functional_tool_name_id = fields.Many2one('sf.functional.tool.assembly', string='功能刀具名称')
barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', related='functional_tool_name_id.barcode_id')
mrs_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型')
diameter = fields.Integer(string='刀具直径(mm)')
knife_tip_r_angle = fields.Float(string='刀尖R角(mm)')
# 其他信息
install_tool_time = fields.Datetime("刀具组装时间")
on_board_time = fields.Datetime('上机装刀时间')
max_lifetime_value = fields.Integer(string='最大寿命值(min)')
alarm_value = fields.Integer(string='报警值(min)')
used_value = fields.Integer(string='已使用值(min)')
functional_tool_status = fields.Selection([('正常', '正常'), ('报警', '报警'), ('已拆除', '已拆除')], string='状态')
alarm_time = fields.Char('报警时间')
dispose_user = fields.Char('处理人')
dispose_time = fields.Char('处理时间')
dispose_func = fields.Char('处理方法/措施', readonly=False)
@api.model
def _read_group_machine_table_name_ids(self, categories, domain, order):
machine_table_name_ids = categories._search([], order=order, access_rights_uid=SUPERUSER_ID)
return categories.browse(machine_table_name_ids)
machine_tool_code = fields.Char('机台号', readonly=True, related='functional_tool_assembly_id.machine_tool_code')
cutting_tool_code = fields.Char('刀位号', readonly=True)
# idle_time = fields.Char('闲置时长', readonly=False)
idle_time = fields.Char('闲置时长(h)', readonly=False)
alarm_value = fields.Char('报警值', readonly=False)
used_value = fields.Char('已使用值', readonly=False)
alarm_type = fields.Char('报警类型', readonly=False)
dispose_user = fields.Char('处理人', readonly=False)
alarm_time = fields.Char('报警时间', readonly=False)
dispose_time = fields.Char('处理时间', readonly=False)
dispose_func = fields.Char('处理方法/措施', readonly=False)
remark = fields.Char('备注', readonly=False)
@api.onchange('functional_cutting_tool_id')
def onchange_functional_cutting_tool_id(self):
print(self.functional_cutting_tool_id.name)
class RealTimeDistributionOfFunctionalTools(models.Model):
_name = 'sf.real.time.distribution.of.functional.tools'
@@ -243,60 +172,61 @@ class RealTimeDistributionOfFunctionalTools(models.Model):
record.mrs_cutting_tool_type_id = record.functional_cutting_tool_id.mrs_cutting_tool_type_id.id
# code = fields.Char('编码', readonly=True, related='functional_cutting_tool_id.code')
barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True,
related='functional_cutting_tool_id.barcode_id')
name = fields.Char('名称', invisible=True, readonly=True, related='functional_cutting_tool_id.name')
functional_tool_name_id = fields.Many2one('product.product', string='功能刀具名称', readonly=True,
related='functional_cutting_tool_id.functional_tool_name_id')
barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True)
name = fields.Char('名称', invisible=True, readonly=True)
functional_tool_name_id = fields.Many2one('product.product', string='功能刀具名称', readonly=True)
# mrs_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True,
# related='functional_cutting_tool_id.mrs_cutting_tool_type_id')
# 整体式刀具型号
cutting_tool_integral_model_id = fields.Many2one('product.product', string='整体式刀具型号', readonly=True,
domain=[('cutting_tool_material_id', '=', '整体式刀具')],
related='functional_cutting_tool_id.cutting_tool_integral_model_id')
cutting_tool_integral_model_id = fields.Many2one(
'product.product', string='整体式刀具型号', readonly=True,
domain=[('cutting_tool_material_id', '=', '整体式刀具')],
related='functional_cutting_tool_id.cutting_tool_integral_model_id')
# 刀片型号
cutting_tool_blade_model_id = fields.Many2one('product.product', string='刀片型号', readonly=True,
domain=[('cutting_tool_material_id', '=', '刀片')],
related='functional_cutting_tool_id.cutting_tool_blade_model_id')
cutting_tool_blade_model_id = fields.Many2one(
'product.product', string='刀片型号', readonly=True,
domain=[('cutting_tool_material_id', '=', '刀片')],
related='functional_cutting_tool_id.cutting_tool_blade_model_id')
# 刀杆型号
cutting_tool_cutterbar_model_id = fields.Many2one('product.product', string='刀杆型号', readonly=True,
domain=[('cutting_tool_material_id', '=', '刀杆')],
related='functional_cutting_tool_id.cutting_tool_cutterbar_model_id')
cutting_tool_cutterbar_model_id = fields.Many2one(
'product.product', string='刀杆型号', readonly=True,
domain=[('cutting_tool_material_id', '=', '刀杆')],
related='functional_cutting_tool_id.cutting_tool_cutterbar_model_id')
# 刀盘型号
cutting_tool_cutterpad_model_id = fields.Many2one('product.product', string='刀盘型号', readonly=True,
domain=[('cutting_tool_material_id', '=', '刀盘')],
related='functional_cutting_tool_id.cutting_tool_cutterpad_model_id')
cutting_tool_cutterpad_model_id = fields.Many2one(
'product.product', string='刀盘型号', readonly=True,
domain=[('cutting_tool_material_id', '=', '刀盘')],
related='functional_cutting_tool_id.cutting_tool_cutterpad_model_id')
# 刀柄型号
cutting_tool_cutterhandle_model_id = fields.Many2one('product.product', string='刀柄型号', readonly=True,
domain=[('cutting_tool_material_id', '=', '刀柄')],
related='functional_cutting_tool_id.cutting_tool_cutterhandle_model_id')
cutting_tool_cutterhandle_model_id = fields.Many2one(
'product.product', string='刀柄型号', readonly=True,
domain=[('cutting_tool_material_id', '=', '刀柄')],
related='functional_cutting_tool_id.cutting_tool_cutterhandle_model_id')
# 夹头型号
cutting_tool_cutterhead_model_id = fields.Many2one('product.product', string='夹头型号', readonly=True,
domain=[('cutting_tool_material_id', '=', '夹头')],
related='functional_cutting_tool_id.cutting_tool_cutterhead_model_id')
cutting_tool_cutterhead_model_id = fields.Many2one(
'product.product', string='夹头型号', readonly=True,
domain=[('cutting_tool_material_id', '=', '夹头')],
related='functional_cutting_tool_id.cutting_tool_cutterhead_model_id')
diameter = fields.Float('直径(mm)', readonly=True, related='functional_cutting_tool_id.diameter')
diameter = fields.Float('直径(mm)', readonly=True)
tool_grade = fields.Selection([('1', 'P1'), ('2', 'P2'), ('3', 'P3'), ('4', 'P4'), ('5', 'P5'), ('6', 'P6')],
string='刀具等级', readonly=True, compute='_compute_functional_cutting_tool_id')
machining_accuracy = fields.Float('加工精度(mm)', readonly=True,
related='functional_cutting_tool_id.machining_accuracy')
tool_length = fields.Float('装刀长(mm)', readonly=True, related='functional_cutting_tool_id.tool_length')
blade_number = fields.Integer('刃数', readonly=True, related='functional_cutting_tool_id.blade_number')
integral_blade_length = fields.Float('整体刃长(mm)', readonly=True,
related='functional_cutting_tool_id.integral_blade_length')
effective_blade_length = fields.Float('有效刃长(mm)', readonly=True,
related='functional_cutting_tool_id.effective_blade_length')
max_life = fields.Float('最大寿命值', readonly=True, related='functional_cutting_tool_id.max_life')
string='刀具等级', readonly=True)
machining_accuracy = fields.Float('加工精度(mm)', readonly=True)
tool_length = fields.Float('装刀长(mm)', readonly=True)
blade_number = fields.Integer('刃数', readonly=True)
integral_blade_length = fields.Float('整体刃长(mm)', readonly=True)
effective_blade_length = fields.Float('有效刃长(mm)', readonly=True)
max_life = fields.Float('最大寿命值', readonly=True)
is_standard = fields.Selection([('1', ''), ('0', '')], '是否标准刀', readonly=True,
compute='_compute_functional_cutting_tool_id')
applicable_range = fields.Char('适用范围', readonly=True, related='functional_cutting_tool_id.applicable_range')
image = fields.Binary('图片', readonly=True, related='functional_cutting_tool_id.image')
applicable_range = fields.Char('适用范围', readonly=True)
image = fields.Binary('图片', readonly=True)
@api.depends('functional_cutting_tool_id')
def _compute_functional_cutting_tool_id(self):
@@ -326,7 +256,8 @@ class RealTimeDistributionOfFunctionalTools(models.Model):
def _compute_return_total(self):
for record in self:
if record:
self.return_total = record.return_reuse_num_re + record.return_reuse_num_co + record.return_processing_num
self.return_total = (record.return_reuse_num_re + record.return_reuse_num_co +
record.return_processing_num)
@api.depends('tool_stock_total', 'return_total')
def _compute_total(self):
@@ -357,58 +288,47 @@ class InboundAndOutboundRecordsOfFunctionalTools(models.Model):
record.mrs_cutting_tool_type_id = record.functional_cutting_tool_id.mrs_cutting_tool_type_id.id
# code = fields.Char('编码', readonly=True, related='functional_cutting_tool_id.code')
barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True,
related='functional_cutting_tool_id.barcode_id')
name = fields.Char('名称', invisible=True, readonly=True, related='functional_cutting_tool_id.name')
functional_tool_name_id = fields.Many2one('product.product', string='功能刀具名称', readonly=True,
related='functional_cutting_tool_id.functional_tool_name_id')
barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True)
name = fields.Char('名称', invisible=True, readonly=True)
functional_tool_name_id = fields.Many2one('product.product', string='功能刀具名称', readonly=True)
# 整体式刀具型号
cutting_tool_integral_model_id = fields.Many2one('product.product', string='整体式刀具型号', readonly=True,
domain=[('cutting_tool_material_id', '=', '整体式刀具')],
related='functional_cutting_tool_id.cutting_tool_integral_model_id')
domain=[('cutting_tool_material_id', '=', '整体式刀具')])
# 刀片型号
cutting_tool_blade_model_id = fields.Many2one('product.product', string='刀片型号', readonly=True,
domain=[('cutting_tool_material_id', '=', '刀片')],
related='functional_cutting_tool_id.cutting_tool_blade_model_id')
domain=[('cutting_tool_material_id', '=', '刀片')])
# 刀杆型号
cutting_tool_cutterbar_model_id = fields.Many2one('product.product', string='刀杆型号', readonly=True,
domain=[('cutting_tool_material_id', '=', '刀杆')],
related='functional_cutting_tool_id.cutting_tool_cutterbar_model_id')
domain=[('cutting_tool_material_id', '=', '刀杆')])
# 刀盘型号
cutting_tool_cutterpad_model_id = fields.Many2one('product.product', string='刀盘型号', readonly=True,
domain=[('cutting_tool_material_id', '=', '刀盘')],
related='functional_cutting_tool_id.cutting_tool_cutterpad_model_id')
domain=[('cutting_tool_material_id', '=', '刀盘')])
# 刀柄型号
cutting_tool_cutterhandle_model_id = fields.Many2one('product.product', string='刀柄型号', readonly=True,
domain=[('cutting_tool_material_id', '=', '刀柄')],
related='functional_cutting_tool_id.cutting_tool_cutterhandle_model_id')
domain=[('cutting_tool_material_id', '=', '刀柄')])
# 夹头型号
cutting_tool_cutterhead_model_id = fields.Many2one('product.product', string='夹头型号', readonly=True,
domain=[('cutting_tool_material_id', '=', '夹头')],
related='functional_cutting_tool_id.cutting_tool_cutterhead_model_id')
domain=[('cutting_tool_material_id', '=', '夹头')])
diameter = fields.Float('直径(mm)', readonly=True, related='functional_cutting_tool_id.diameter')
diameter = fields.Float('直径(mm)', readonly=True)
tool_grade = fields.Selection([('1', 'P1'), ('2', 'P2'), ('3', 'P3'), ('4', 'P4'), ('5', 'P5'), ('6', 'P6')],
string='刀具等级', readonly=True, compute='_compute_functional_cutting_tool_id')
machining_accuracy = fields.Float('加工精度(mm)', readonly=True,
related='functional_cutting_tool_id.machining_accuracy')
tool_length = fields.Float('装刀长(mm)', readonly=True, related='functional_cutting_tool_id.tool_length')
blade_number = fields.Integer('刃数', readonly=True, related='functional_cutting_tool_id.blade_number')
integral_blade_length = fields.Float('整体刃长(mm)', readonly=True,
related='functional_cutting_tool_id.integral_blade_length')
effective_blade_length = fields.Float('有效刃长(mm)', readonly=True,
related='functional_cutting_tool_id.effective_blade_length')
max_life = fields.Float('最大寿命值', readonly=True, related='functional_cutting_tool_id.max_life')
machining_accuracy = fields.Float('加工精度(mm)', readonly=True)
tool_length = fields.Float('装刀长(mm)', readonly=True)
blade_number = fields.Integer('刃数', readonly=True)
integral_blade_length = fields.Float('整体刃长(mm)', readonly=True)
effective_blade_length = fields.Float('有效刃长(mm)', readonly=True)
max_life = fields.Float('最大寿命值', readonly=True)
is_standard = fields.Selection([('1', ''), ('0', '')], '是否标准刀', readonly=True,
compute='_compute_functional_cutting_tool_id')
applicable_range = fields.Char('适用范围', readonly=True, related='functional_cutting_tool_id.applicable_range')
image = fields.Binary('图片', readonly=True, related='functional_cutting_tool_id.image')
applicable_range = fields.Char('适用范围', readonly=True)
image = fields.Binary('图片', readonly=True)
@api.depends('functional_cutting_tool_id')
def _compute_functional_cutting_tool_id(self):
@@ -469,8 +389,7 @@ class MachineTableToolChangingApply(models.Model):
compute='_compute_machine_table_type_id')
machine_tool_code = fields.Char(string='机台号', store=True, invisible=True, readonly=True)
cutter_spacing_code_id = fields.Many2one('maintenance.equipment.tool', string='刀位号', readonly=False,
required=True,
domain="[('equipment_id', '=', name)]")
required=True, domain="[('equipment_id', '=', maintenance_equipment_id)]")
barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号',
domain=[('product_id.name', '=', '功能刀具')])
functional_tool_name = fields.Char(string='功能刀具名称')
@@ -712,7 +631,7 @@ class FunctionalToolAssembly(models.Model):
@api.depends('functional_tool_name')
def _compute_name(self):
for obj in self:
obj.name = obj.functional_tool_name
obj.name = obj.after_assembly_functional_tool_name
name = fields.Char(string='名称', readonly=True, compute='_compute_name')
assembly_order_code = fields.Char(string='编码', readonly=True)

View File

@@ -13,7 +13,7 @@
name="功能刀具列表"
sequence="4"
action="sf_function_tool_entry_list_view_act"
/>
/>
<menuitem
@@ -22,7 +22,7 @@
name="功能刀具预警"
sequence="5"
action="action_sf_functional_tool_warning"
/>
/>
<menuitem
sequence="6"
@@ -30,22 +30,22 @@
id="menu_sf_functional_tool_real_time_distribution"
action="sf_real_time_distribution_of_functional_tools_view_act"
parent="menu_sf_tool_manage"
/>
/>
<!-- <menuitem-->
<!-- sequence="10"-->
<!-- name="功能刀具出入库记录"-->
<!-- id="menu_sf_function_tool_entry_exit_records"-->
<!-- action="sf_inbound_and_outbound_records_of_functional_tools_view_act"-->
<!-- parent="menu_sf_tool_manage"-->
<!-- />-->
<menuitem
sequence="10"
name="功能刀具出入库记录"
id="menu_sf_function_tool_entry_exit_records"
action="sf_inbound_and_outbound_records_of_functional_tools_view_act"
parent="menu_sf_tool_manage"
/>
<menuitem
sequence="0"
name="功能刀具计划"
id="menu_sf_function_tool_plan"
parent="menu_sf_tool_manage"
/>
/>
<menuitem
sequence="10"
@@ -53,7 +53,7 @@
id="menu_sf_cam_work_order_program_knife_plan"
action="sf_cam_work_order_program_knife_plan_view_act"
parent="menu_sf_function_tool_plan"
/>
/>
<menuitem
sequence="0"
@@ -61,7 +61,7 @@
id="menu_sf_machine_table_tool_changing_apply"
action="sf_machine_table_tool_changing_apply_view_act"
parent="menu_sf_function_tool_plan"
/>
/>
<menuitem
sequence="2"
@@ -69,8 +69,7 @@
id="menu_sf_functional_tool_assembly"
action="sf_functional_tool_assembly_view_act"
parent="menu_sf_tool_manage"
/>
/>
</data>
</odoo>
</odoo>

View File

@@ -9,14 +9,24 @@
<tree string="功能刀具列表" create="0" edit="0" delete="0">
<field name="barcode_id"/>
<field name="functional_tool_name_id"/>
<field name="mrs_cutting_tool_type_id"/>
<field name="cutting_tool_integral_model_id" optional="hide"/>
<field name="cutting_tool_blade_model_id" optional="hide"/>
<field name="cutting_tool_cutterbar_model_id" optional="hide"/>
<field name="cutting_tool_cutterpad_model_id" optional="hide"/>
<field name="cutting_tool_cutterhandle_model_id" optional="hide"/>
<field name="cutting_tool_cutterhead_model_id" optional="hide"/>
<field name="image" widget='image'/>
<field name="functional_tool_diameter"/>
<field name="knife_tip_r_angle"/>
<field name="coarse_middle_thin" optional="hide"/>
<field name="new_former" optional="hide"/>
<field name="tool_loading_length" optional="hide"/>
<field name="functional_tool_length" optional="hide"/>
<field name="effective_length" optional="hide"/>
<field name="tool_room_num"/>
<field name="line_edge_knife_library_num"/>
<field name="machine_knife_library_num"/>
<field name="max_lifetime_value"/>
<field name="alarm_value"/>
<field name="used_value"/>
<field name="functional_tool_status"/>
<field name="current_location_id" invisible="True"/>
<field name="sf_cutting_tool_type_id" invisible="True"/>
</tree>
</field>
</record>
@@ -26,6 +36,9 @@
<field name="model">sf.functional.cutting.tool.entity</field>
<field name="arch" type="xml">
<form create="0" edit="0" delete="0">
<header>
<field name="functional_tool_status" widget="statusbar" statusbar_visible="正常,报警,已拆除"/>
</header>
<sheet>
<div class="oe_button_box" name="button_box">
<button class="oe_stat_button"
@@ -34,7 +47,7 @@
type="object">
<div class="o_field_widget o_stat_info">
<span>
预警
预警记录
</span>
</div>
</button>
@@ -50,7 +63,7 @@
<group>
<field name="functional_tool_name_id" invisible="False"
placeholder="请输入20字以内的名称"/>
<field name="mrs_cutting_tool_type_id"/>
<field name="sf_cutting_tool_type_id"/>
<field name="cutting_tool_integral_model_id"
options="{'no_create': True, 'no_quick_create': True}"
attrs="{'invisible': [('cutting_tool_blade_model_id', '!=', False)]}"
@@ -71,42 +84,11 @@
options="{'no_create': True, 'no_quick_create': True}"/>
<field name="cutting_tool_cutterhead_model_id"
options="{'no_create': True, 'no_quick_create': True}"/>
<!-- <field name="functional_cutting_tool_id"/>-->
<!-- <field name="cutting_tool_material" required="1" widget="radio"-->
<!-- options="{'horizontal': true}"/>-->
<!-- <field name="mrs_cutting_tool_integral_model_ids"-->
<!-- options="{'no_create': True, 'no_quick_create': True}"-->
<!-- widget="many2many_tags"-->
<!-- attrs="{'invisible': [('cutting_tool_material', '!=', '0')]}"-->
<!-- />-->
<!-- <field name="mrs_cutting_tool_blade_model_ids"-->
<!-- options="{'no_create': True, 'no_quick_create': True}"-->
<!-- widget="many2many_tags"-->
<!-- attrs="{'invisible': [('cutting_tool_material', '!=', '1')]}"-->
<!-- />-->
<!-- <field name="mrs_cutting_tool_cutterbar_model_ids"-->
<!-- options="{'no_create': True, 'no_quick_create': True}"-->
<!-- widget="many2many_tags"-->
<!-- attrs="{'invisible': ['|',('mrs_cutting_tool_cutterpad_model_ids','!=',[]),('cutting_tool_material', '!=', '1')]}"-->
<!-- />-->
<!-- <field name="mrs_cutting_tool_cutterpad_model_ids"-->
<!-- options="{'no_create': True, 'no_quick_create': True}"-->
<!-- widget="many2many_tags"-->
<!-- attrs="{'invisible': ['|',('mrs_cutting_tool_cutterbar_model_ids','!=',[]),('cutting_tool_material', '!=', '1')]}"-->
<!-- />-->
<!-- <field name="mrs_cutting_tool_cutterhandle_model_ids"-->
<!-- options="{'no_create': True, 'no_quick_create': True}"-->
<!-- widget="many2many_tags"/>-->
<!-- <field name="mrs_cutting_tool_cutterhead_model_ids"-->
<!-- options="{'no_create': True, 'no_quick_create': True}"-->
<!-- widget="many2many_tags"/>-->
</group>
<group>
<field name="image" nolabel="1" widget="image"/>
</group>
</group>
<!-- attrs="{'invisible': [('cutting_tool_blade_model_id', '!=', False)]}"-->
<group col="1">
<group string="适合加工方式">
<field name="suitable_machining_method_ids" string=""
@@ -139,18 +121,24 @@
<page string='参数'>
<group>
<group>
<field name="diameter"/>
<field name="tool_grade"/>
<field name="machining_accuracy"/>
<field name="tool_length"/>
<field name="blade_number"/>
<field name="functional_tool_diameter"/>
<field name="knife_tip_r_angle"/>
<field name="whether_standard_knife"/>
<field name="coarse_middle_thin"/>
<field name="max_lifetime_value"/>
<field name="alarm_value"/>
<field name="used_value"/>
<field name="current_location_id"/>
</group>
<group>
<field name="integral_blade_length"/>
<field name="effective_blade_length"/>
<field name="max_life"/>
<field name="is_standard" default="false"/>
<field name="applicable_range"/>
<field name="tool_loading_length"/>
<field name="functional_tool_length"/>
<field name="effective_length"/>
<field name="L_D_number"/>
<field name="hiding_length"/>
<field name="cut_time"/>
<field name="cut_length"/>
<field name="cut_number"/>
</group>
</group>
</page>
@@ -167,15 +155,28 @@
<search>
<field name="barcode_id"/>
<field name="functional_tool_name_id"/>
<field name="mrs_cutting_tool_type_id"/>
<field name="cutting_tool_integral_model_id" optional="hide"/>
<field name="cutting_tool_blade_model_id" optional="hide"/>
<field name="cutting_tool_cutterbar_model_id" optional="hide"/>
<field name="cutting_tool_cutterpad_model_id" optional="hide"/>
<field name="cutting_tool_cutterhandle_model_id" optional="hide"/>
<field name="cutting_tool_cutterhead_model_id" optional="hide"/>
<field name="image" widget='image'/>
<field name="functional_tool_diameter"/>
<field name="knife_tip_r_angle"/>
<field name="coarse_middle_thin" optional="hide"/>
<field name="new_former" optional="hide"/>
<field name="tool_loading_length" optional="hide"/>
<field name="functional_tool_length" optional="hide"/>
<field name="effective_length" optional="hide"/>
<field name="tool_room_num"/>
<field name="line_edge_knife_library_num"/>
<field name="machine_knife_library_num"/>
<field name="max_lifetime_value"/>
<field name="alarm_value"/>
<field name="used_value"/>
<field name="functional_tool_status" optional="hide"/>
<field name="current_location_id" invisible="True"/>
<field name="sf_cutting_tool_type_id" invisible="True"/>
<searchpanel>
<field name="mrs_cutting_tool_type_id" icon="fa-building" enable_counters="1"/>
<field name="sf_cutting_tool_type_id" icon="fa-building" enable_counters="1"/>
<field name="current_location_id" icon="fa-building" enable_counters="1"/>
<field name="functional_tool_status" icon="fa-building" enable_counters="1"/>
</searchpanel>
</search>
</field>
@@ -194,148 +195,54 @@
<field name="name">sf.functional.tool.warning.tree</field>
<field name="model">sf.functional.tool.warning</field>
<field name="arch" type="xml">
<tree string="功能刀具预警" create="0" edit="0" delete="0">
<tree string="功能刀具预警" create="1" edit="1" delete="1" editable="bottom">
<field name="production_line_id" optional="hide"/>
<field name="maintenance_equipment_id" optional="hide"/>
<field name="machine_tool_code"/>
<field name="cutter_spacing_code_id"/>
<field name="barcode_id"/>
<field name="functional_tool_name_id"/>
<field name="mrs_cutting_tool_type_id"/>
<field name="cutting_tool_integral_model_id" optional="hide"/>
<field name="cutting_tool_blade_model_id" optional="hide"/>
<field name="cutting_tool_cutterbar_model_id" optional="hide"/>
<field name="cutting_tool_cutterpad_model_id" optional="hide"/>
<field name="cutting_tool_cutterhandle_model_id" optional="hide"/>
<field name="cutting_tool_cutterhead_model_id" optional="hide"/>
<field name="machine_tool_code" optional="show"/>
<field name="cutting_tool_code" optional="show"/>
<field name="alarm_value" optional="hide"/>
<field name="alarm_type" optional="show"/>
<field name="alarm_time" optional="show"/>
<field name="dispose_user" optional="show"/>
<field name="dispose_time" optional="show"/>
<field name="dispose_func" optional="hide"/>
<field name="remark" optional="show"/>
<field name="diameter"/>
<field name="knife_tip_r_angle"/>
<field name="install_tool_time" optional="hide"/>
<field name="on_board_time" optional="hide"/>
<field name="max_lifetime_value"/>
<field name="alarm_value"/>
<field name="used_value"/>
<field name="functional_tool_status"/>
<field name="alarm_time"/>
<field name="dispose_user"/>
<field name="dispose_time"/>
<field name="dispose_func"/>
</tree>
</field>
</record>
<record id="view_sf_functional_tool_warning_form" model="ir.ui.view">
<field name="name">sf.functional.tool.warning.form</field>
<field name="model">sf.functional.tool.warning</field>
<field name="arch" type="xml">
<form string="功能刀具预警" create="0" edit="0" delete="0">
<sheet>
<div class="oe_title">
<h1>
<field name="barcode_id" readonly="1"/>
</h1>
</div>
<group>
<group>
<field name="functional_tool_name_id" invisible="False"/>
<field name="mrs_cutting_tool_type_id"/>
<field name="cutting_tool_integral_model_id"
options="{'no_create': True, 'no_quick_create': True}"
attrs="{'invisible': [('cutting_tool_blade_model_id', '!=', False)]}"
/>
<field name="cutting_tool_blade_model_id"
options="{'no_create': True, 'no_quick_create': True}"
attrs="{'invisible': [('cutting_tool_integral_model_id', '!=', False)]}"
/>
<field name="cutting_tool_cutterbar_model_id"
options="{'no_create': True, 'no_quick_create': True}"
attrs="{'invisible': ['|',('cutting_tool_cutterpad_model_id','!=',False),('cutting_tool_blade_model_id', '=', False)]}"
/>
<field name="cutting_tool_cutterpad_model_id"
options="{'no_create': True, 'no_quick_create': True}"
attrs="{'invisible': ['|',('cutting_tool_cutterbar_model_id','!=',False),('cutting_tool_blade_model_id', '=', False)]}"
/>
<field name="cutting_tool_cutterhandle_model_id"
options="{'no_create': True, 'no_quick_create': True}"/>
<field name="cutting_tool_cutterhead_model_id"
options="{'no_create': True, 'no_quick_create': True}"/>
</group>
<group>
<field name="image" nolabel="1" widget="image"/>
</group>
</group>
<notebook>
<page string="预警信息">
<group>
<group>
<field name="machine_tool_code"/>
<field name="install_tool_time"/>
<field name="outbound_time"/>
<field name="used_value"/>
<field name="alarm_type"/>
<field name="alarm_time"/>
<field name="alarm_value"/>
</group>
<group>
<field name="cutting_tool_code"/>
<field name="on_board_time"/>
<field name="idle_time"/>
<field name="dispose_user"/>
<field name="dispose_time"/>
<field name="dispose_func"/>
</group>
</group>
</page>
<page string="参数信息">
<group>
<group>
<field name="diameter"/>
<field name="tool_grade"/>
<field name="machining_accuracy"/>
<field name="tool_length"/>
<field name="blade_number"/>
</group>
<group>
<field name="integral_blade_length"/>
<field name="effective_blade_length"/>
<field name="max_life"/>
<field name="is_standard" default="false"/>
<field name="applicable_range"/>
</group>
</group>
</page>
<page string="其他信息">
<group>
<field name="remark"/>
</group>
</page>
</notebook>
</sheet>
</form>
</field>
</record>
<record id="view_sf_functional_tool_warning_search" model="ir.ui.view">
<field name="name">sf.functional.tool.warning.search</field>
<field name="model">sf.functional.tool.warning</field>
<field name="arch" type="xml">
<search string="功能刀具预警">
<field name="machine_tool_code"/>
<field name="cutter_spacing_code_id"/>
<field name="barcode_id"/>
<field name="functional_tool_name_id"/>
<field name="mrs_cutting_tool_type_id"/>
<field name="cutting_tool_integral_model_id" optional="hide"/>
<field name="cutting_tool_blade_model_id" optional="hide"/>
<field name="cutting_tool_cutterbar_model_id" optional="hide"/>
<field name="cutting_tool_cutterpad_model_id" optional="hide"/>
<field name="cutting_tool_cutterhandle_model_id" optional="hide"/>
<field name="cutting_tool_cutterhead_model_id" optional="hide"/>
<field name="machine_tool_code" optional="show"/>
<field name="cutting_tool_code" optional="show"/>
<field name="alarm_value" optional="show"/>
<field name="alarm_type" optional="show"/>
<field name="alarm_time" optional="show"/>
<field name="dispose_user" optional="show"/>
<field name="dispose_time" optional="show"/>
<field name="dispose_func" optional="show"/>
<field name="remark" optional="show"/>
<field name="diameter"/>
<field name="knife_tip_r_angle"/>
<field name="install_tool_time" optional="hide"/>
<field name="on_board_time" optional="hide"/>
<field name="max_lifetime_value"/>
<field name="alarm_value"/>
<field name="used_value"/>
<field name="functional_tool_status"/>
<field name="alarm_time"/>
<field name="dispose_user"/>
<field name="dispose_time"/>
<field name="dispose_func"/>
<field name="production_line_id" invisible="True"/>
<searchpanel>
<field name="machine_table_name_id" string="CNC机床列表" icon="fa-building"
enable_counters="1"/>
<field name="production_line_id" icon="fa-building" enable_counters="1"/>
<field name="functional_tool_status" icon="fa-building" enable_counters="1"/>
</searchpanel>
</search>
</field>
@@ -345,7 +252,7 @@
<field name="name">功能刀具预警</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sf.functional.tool.warning</field>
<field name="view_mode">tree,form,search</field>
<field name="view_mode">tree,search</field>
</record>
@@ -1114,6 +1021,7 @@
name="%(sf_tool_management.sf_functional_tool_assembly_order_act)d"
type="action"
context="{'default_name':name,
'default_assembly_order_code':assembly_order_code,
'default_production_line_name_id':production_line_name_id,
'default_machine_tool_name_id':machine_tool_name_id,
'default_cutter_spacing_code_id':cutter_spacing_code_id,
@@ -1150,6 +1058,7 @@
name="%(sf_tool_management.sf_functional_tool_assembly_order_act)d"
type="action"
context="{'default_name':name,
'default_assembly_order_code':assembly_order_code,
'default_production_line_name_id':production_line_name_id,
'default_machine_tool_name_id':machine_tool_name_id,
'default_cutter_spacing_code_id':cutter_spacing_code_id,

View File

@@ -1 +1 @@
from . import wizard
from . import wizard

View File

@@ -154,6 +154,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
_inherit = ["barcodes.barcode_events_mixin"]
_description = '功能刀具组装单'
assembly_order_code = fields.Char(string='编码', readonly=True)
functional_tool_name_id = fields.Many2one('product.product', string='功能刀具', readonly=True)
functional_tool_name = fields.Char(string='功能刀具名称', readonly=True)
functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True,
@@ -320,7 +321,8 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
cut_number = fields.Integer(string='已切削次数')
after_assembly_whether_standard_knife = fields.Boolean(string='组装后是否标准刀', default=True)
after_assembly_coarse_middle_thin = fields.Selection([("1", ""), ('2', ''), ('3', '')], string='组装后粗/中/精')
after_assembly_coarse_middle_thin = fields.Selection([("1", ""), ('2', ''), ('3', '')],
string='组装后粗/中/精')
after_assembly_max_lifetime_value = fields.Integer(string='组装后最大寿命值(min)')
after_assembly_alarm_value = fields.Integer(string='组装后报警值(min)')
after_assembly_used_value = fields.Integer(string='组装后已使用值(min)')
@@ -348,6 +350,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
# 封装功能刀具数据
desc_1 = self.get_desc_1(stock_lot)
functional_tool_assembly = self.env['sf.functional.tool.assembly'].search([
('assembly_order_code', '=', self.assembly_order_code),
('machine_tool_name_id', '=', self.machine_tool_name_id.id),
('cutter_spacing_code_id', '=', self.cutter_spacing_code_id.id),
('assemble_status', '=', '0'),
@@ -355,9 +358,9 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
# 创建功能刀具列表记录
# 封装功能刀具数据
# desc_2 = self.get_desc_2(stock_lot)
# # 创建功能刀具列表、功能刀具预警、功能刀具实时分布、功能刀具出入库记录
# record_1 = self.env['sf.functional.cutting.tool.entity'].create(desc_2)
desc_2 = self.get_desc_2(stock_lot, functional_tool_assembly)
# 创建功能刀具列表、功能刀具预警、功能刀具实时分布、功能刀具出入库记录
record_1 = self.env['sf.functional.cutting.tool.entity'].create(desc_2)
# self.env['sf.functional.tool.warning'].create({
# 'functional_cutting_tool_id': record_1.id,
# 'functional_tool_assembly_id': functional_tool_assembly.id,
@@ -512,26 +515,34 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
'tool_loading_time': fields.Datetime.now()
}
def get_desc_2(self, stock_lot):
def get_desc_2(self, stock_lot, functional_tool_assembly_id):
return {
'barcode_id': stock_lot.id,
'functional_tool_name_id': self.functional_tool_name_id.id,
'mrs_cutting_tool_type_id': self.functional_tool_type_id.id,
'functional_tool_name_id': functional_tool_assembly_id.id,
'sf_cutting_tool_type_id': self.after_assembly_functional_tool_type_id.id,
'cutting_tool_integral_model_id': self.integral_code_id.product_id.id,
'cutting_tool_blade_model_id': self.blade_code_id.product_id.id,
'cutting_tool_cutterbar_model_id': self.bar_code_id.product_id.id,
'cutting_tool_cutterpad_model_id': self.pad_code_id.product_id.id,
'cutting_tool_cutterhandle_model_id': self.handle_code_id.product_id.id,
'cutting_tool_cutterhead_model_id': self.chuck_code_id.product_id.id,
'diameter': self.functional_tool_diameter,
'tool_grade': None,
'machining_accuracy': None,
'tool_length': self.tool_loading_length,
'blade_number': None,
'integral_blade_length': None,
'effective_blade_length': self.effective_length,
'max_life': None,
'is_standard': self.whether_standard_tool,
'applicable_range': None,
'image': None,
'functional_tool_diameter': self.after_assembly_functional_tool_diameter,
'knife_tip_r_angle': self.after_assembly_knife_tip_r_angle,
'coarse_middle_thin': self.after_assembly_coarse_middle_thin,
'new_former': self.after_assembly_new_former,
'tool_loading_length': self.after_assembly_tool_loading_length,
'functional_tool_length': self.after_assembly_functional_tool_length,
'effective_length': self.after_assembly_effective_length,
'max_lifetime_value': self.after_assembly_max_lifetime_value,
'alarm_value': self.after_assembly_alarm_value,
'used_value': self.after_assembly_used_value,
'whether_standard_knife': self.after_assembly_whether_standard_knife,
'L_D_number': self.L_D_number,
'hiding_length': self.hiding_length,
'cut_time': self.cut_time,
'cut_length': self.cut_length,
'cut_number': self.cut_number,
'current_location_id': stock_lot.quant_ids.location_id.ids[-1],
}