1、刀具管理模块下的功能刀具内的刀具物料字段类型从many2many更改为many2one，绑定对象从刀具型号更改为刀具物料；2、对功能刀具组装的组装功能和取消组装功能进行了逻辑优化；3、新增功能刀具组装弹窗对象的刀具物料信息根据所选功能刀具字段计算功能；4、关闭了功能刀具列表、预警、实时分布、出入库记录的创建、修改、删除功能；5、功能刀具列表对象新增刀具能力参数；6、优化了刀具管理模块的权限相关警告；
This commit is contained in:
yuxianghui
@@ -24,46 +24,28 @@ class FunctionalCuttingToolEntity(models.Model):
|
||||
return categories.browse(mrs_cutting_tool_type_ids)
|
||||
|
||||
# 整体式刀具型号
|
||||
mrs_cutting_tool_integral_model_ids = fields.Many2many('sf.cutting.tool.model',
|
||||
'sf_functional_cutting_tool_entity_id',
|
||||
string='整体式刀具型号', domain=
|
||||
[('cutting_tool_type', '=', '整体式刀具')])
|
||||
cutting_tool_integral_model_id = fields.Many2one('sf.tool.material.search', string='整体式刀具型号', readonly=True,
|
||||
domain=[('cutting_tool_type', '=', '整体式刀具')])
|
||||
|
||||
# 刀片型号
|
||||
mrs_cutting_tool_blade_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_cutting_tool_entity_id',
|
||||
string='刀片型号', domain=
|
||||
[('cutting_tool_type', '=', '刀片')])
|
||||
cutting_tool_blade_model_id = fields.Many2one('sf.tool.material.search', string='刀片型号', readonly=True,
|
||||
domain=[('cutting_tool_type', '=', '刀片')])
|
||||
|
||||
# 刀杆型号
|
||||
mrs_cutting_tool_cutterbar_model_ids = fields.Many2many('sf.cutting.tool.model',
|
||||
'sf_functional_cutting_tool_entity_id',
|
||||
string='刀杆型号', domain=
|
||||
[('cutting_tool_type', '=', '刀杆')])
|
||||
cutting_tool_cutterbar_model_id = fields.Many2one('sf.tool.material.search', string='刀杆型号', readonly=True,
|
||||
domain=[('cutting_tool_type', '=', '刀杆')])
|
||||
|
||||
# 刀盘型号
|
||||
mrs_cutting_tool_cutterpad_model_ids = fields.Many2many('sf.cutting.tool.model',
|
||||
'sf_functional_cutting_tool_entity_id',
|
||||
string='刀盘型号', domain=
|
||||
[('cutting_tool_type', '=', '刀盘')])
|
||||
cutting_tool_cutterpad_model_id = fields.Many2one('sf.tool.material.search', string='刀盘型号', readonly=True,
|
||||
domain=[('cutting_tool_type', '=', '刀盘')])
|
||||
|
||||
# 刀柄型号
|
||||
mrs_cutting_tool_cutterhandle_model_ids = fields.Many2many('sf.cutting.tool.model',
|
||||
'sf_functional_cutting_tool_entity_id',
|
||||
string='刀柄型号', domain=
|
||||
[('cutting_tool_type', '=', '刀柄')])
|
||||
cutting_tool_cutterhandle_model_id = fields.Many2one('sf.tool.material.search', string='刀柄型号', readonly=True,
|
||||
domain=[('cutting_tool_type', '=', '刀柄')])
|
||||
|
||||
# 夹头型号
|
||||
mrs_cutting_tool_cutterhead_model_ids = fields.Many2many('sf.cutting.tool.model',
|
||||
'sf_functional_cutting_tool_entity_id',
|
||||
string='夹头型号', domain=
|
||||
[('cutting_tool_type', '=', '夹头')])
|
||||
# cutting_tool_material = fields.Selection([('0', '整体式刀具'), ('1', '组合式刀具')], string='刀具物料', default='0')
|
||||
#
|
||||
# @api.onchange('cutting_tool_material')
|
||||
# def _onchange_cutting_tool_material(self):
|
||||
# for record in self:
|
||||
# if record:
|
||||
# if record.cutting_tool_material == '1':
|
||||
# record.mrs_cutting_tool_integral_model_ids = None
|
||||
# if record.cutting_tool_material == '0':
|
||||
# record.mrs_cutting_tool_blade_model_ids = None
|
||||
# record.mrs_cutting_tool_cutterbar_model_ids = None
|
||||
# record.mrs_cutting_tool_cutterpad_model_ids = None
|
||||
cutting_tool_cutterhead_model_id = fields.Many2one('sf.tool.material.search', string='夹头型号', readonly=True,
|
||||
domain=[('cutting_tool_type', '=', '夹头')])
|
||||
|
||||
diameter = fields.Float('直径(mm)')
|
||||
tool_grade = fields.Selection([('1', 'P1'), ('2', 'P2'), ('3', 'P3'), ('4', 'P4'), ('5', 'P5'), ('6', 'P6')],
|
||||
@@ -78,6 +60,31 @@ class FunctionalCuttingToolEntity(models.Model):
|
||||
applicable_range = fields.Char('适用范围')
|
||||
image = fields.Binary('图片')
|
||||
|
||||
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_ids = fields.Many2many('maintenance.equipment.image',
|
||||
'rel_blade_tip_product_template_tool_entity', '刀尖特征',
|
||||
domain=[('type', '=', '刀尖特征')],
|
||||
related='cutting_tool_integral_model_id.blade_tip_characteristics_ids')
|
||||
|
||||
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 = []
|
||||
for item in functional_tool_model_code:
|
||||
@@ -96,48 +103,28 @@ class FunctionalCuttingToolEntityCache(models.Model):
|
||||
mrs_cutting_tool_model_id = fields.Many2one('sf.cutting.tool.model', string='刀具型号')
|
||||
|
||||
# 整体式刀具型号
|
||||
mrs_cutting_tool_integral_model_ids = fields.Many2many('sf.cutting.tool.model',
|
||||
'sf_functional_cutting_tool_entity_cache_id',
|
||||
string='整体式刀具型号', domain=
|
||||
[('cutting_tool_type', '=', '整体式刀具')])
|
||||
# 刀片型号
|
||||
mrs_cutting_tool_blade_model_ids = fields.Many2many('sf.cutting.tool.model',
|
||||
'sf_functional_cutting_tool_entity_cache_id',
|
||||
string='刀片型号', domain=
|
||||
[('cutting_tool_type', '=', '刀片')])
|
||||
# 刀杆型号
|
||||
mrs_cutting_tool_cutterbar_model_ids = fields.Many2many('sf.cutting.tool.model',
|
||||
'sf_functional_cutting_tool_entity_cache_id',
|
||||
string='刀杆型号', domain=
|
||||
[('cutting_tool_type', '=', '刀杆')])
|
||||
# 刀盘型号
|
||||
mrs_cutting_tool_cutterpad_model_ids = fields.Many2many('sf.cutting.tool.model',
|
||||
'sf_functional_cutting_tool_entity_cache_id',
|
||||
string='刀盘型号', domain=
|
||||
[('cutting_tool_type', '=', '刀盘')])
|
||||
# 刀柄型号
|
||||
mrs_cutting_tool_cutterhandle_model_ids = fields.Many2many('sf.cutting.tool.model',
|
||||
'sf_functional_cutting_tool_entity_cache_id',
|
||||
string='刀柄型号', domain=
|
||||
[('cutting_tool_type', '=', '刀柄')])
|
||||
# 夹头型号
|
||||
mrs_cutting_tool_cutterhead_model_ids = fields.Many2many('sf.cutting.tool.model',
|
||||
'sf_functional_cutting_tool_entity_cache_id',
|
||||
string='夹头型号', domain=
|
||||
[('cutting_tool_type', '=', '夹头')])
|
||||
# cutting_tool_material = fields.Selection([('0', '整体式刀具'), ('1', '组合式刀具')], string='刀具物料', default='0')
|
||||
#
|
||||
# @api.onchange('cutting_tool_material')
|
||||
# def _onchange_cutting_tool_material(self):
|
||||
# for record in self:
|
||||
# if record:
|
||||
# if record.cutting_tool_material == '1':
|
||||
# record.mrs_cutting_tool_integral_model_ids = None
|
||||
# if record.cutting_tool_material == '0':
|
||||
# record.mrs_cutting_tool_blade_model_ids = None
|
||||
# record.mrs_cutting_tool_cutterbar_model_ids = None
|
||||
# record.mrs_cutting_tool_cutterpad_model_ids = None
|
||||
cutting_tool_integral_model_id = fields.Many2one('sf.tool.material.search', string='整体式刀具型号', readonly=True,
|
||||
domain=[('cutting_tool_type', '=', '整体式刀具')])
|
||||
|
||||
# 刀片型号
|
||||
cutting_tool_blade_model_id = fields.Many2one('sf.tool.material.search', string='刀片型号', readonly=True,
|
||||
domain=[('cutting_tool_type', '=', '刀片')])
|
||||
|
||||
# 刀杆型号
|
||||
cutting_tool_cutterbar_model_id = fields.Many2one('sf.tool.material.search', string='刀杆型号', readonly=True,
|
||||
domain=[('cutting_tool_type', '=', '刀杆')])
|
||||
|
||||
# 刀盘型号
|
||||
cutting_tool_cutterpad_model_id = fields.Many2one('sf.tool.material.search', string='刀盘型号', readonly=True,
|
||||
domain=[('cutting_tool_type', '=', '刀盘')])
|
||||
|
||||
# 刀柄型号
|
||||
cutting_tool_cutterhandle_model_id = fields.Many2one('sf.tool.material.search', string='刀柄型号', readonly=True,
|
||||
domain=[('cutting_tool_type', '=', '刀柄')])
|
||||
|
||||
# 夹头型号
|
||||
cutting_tool_cutterhead_model_id = fields.Many2one('sf.tool.material.search', string='夹头型号', readonly=True,
|
||||
domain=[('cutting_tool_type', '=', '夹头')])
|
||||
|
||||
diameter = fields.Float('直径(mm)')
|
||||
tool_grade = fields.Selection([('1', 'P1'), ('2', 'P2'), ('3', 'P3'), ('4', 'P4'), ('5', 'P5'), ('6', 'P6')],
|
||||
@@ -166,54 +153,34 @@ class FunctionalToolWarning(models.Model):
|
||||
related='functional_cutting_tool_id.mrs_cutting_tool_type_id')
|
||||
|
||||
# 整体式刀具型号
|
||||
mrs_cutting_tool_integral_model_ids = fields.Many2many('sf.cutting.tool.model',
|
||||
'sf_functional_tool_warning_id',
|
||||
string='整体式刀具型号', readonly=True,
|
||||
domain=[
|
||||
('cutting_tool_type', '=', '整体式刀具')],
|
||||
related='functional_cutting_tool_id.mrs_cutting_tool_integral_model_ids')
|
||||
cutting_tool_integral_model_id = fields.Many2one('sf.tool.material.search', string='整体式刀具型号', readonly=True,
|
||||
domain=[('cutting_tool_type', '=', '整体式刀具')],
|
||||
related='functional_cutting_tool_id.cutting_tool_integral_model_id')
|
||||
|
||||
# 刀片型号
|
||||
mrs_cutting_tool_blade_model_ids = fields.Many2many('sf.cutting.tool.model',
|
||||
'sf_functional_tool_warning_id',
|
||||
string='刀片型号', readonly=True,
|
||||
domain=[('cutting_tool_type', '=', '刀片')],
|
||||
related='functional_cutting_tool_id.mrs_cutting_tool_blade_model_ids')
|
||||
cutting_tool_blade_model_id = fields.Many2one('sf.tool.material.search', string='刀片型号', readonly=True,
|
||||
domain=[('cutting_tool_type', '=', '刀片')],
|
||||
related='functional_cutting_tool_id.cutting_tool_blade_model_id')
|
||||
|
||||
# 刀杆型号
|
||||
mrs_cutting_tool_cutterbar_model_ids = fields.Many2many('sf.cutting.tool.model',
|
||||
'sf_functional_tool_warning_id',
|
||||
string='刀杆型号', readonly=True,
|
||||
domain=[('cutting_tool_type', '=', '刀杆')],
|
||||
related='functional_cutting_tool_id.mrs_cutting_tool_cutterbar_model_ids')
|
||||
cutting_tool_cutterbar_model_id = fields.Many2one('sf.tool.material.search', string='刀杆型号', readonly=True,
|
||||
domain=[('cutting_tool_type', '=', '刀杆')],
|
||||
related='functional_cutting_tool_id.cutting_tool_cutterbar_model_id')
|
||||
|
||||
# 刀盘型号
|
||||
mrs_cutting_tool_cutterpad_model_ids = fields.Many2many('sf.cutting.tool.model',
|
||||
'sf_functional_tool_warning_id',
|
||||
string='刀盘型号', readonly=True,
|
||||
domain=[('cutting_tool_type', '=', '刀盘')],
|
||||
related='functional_cutting_tool_id.mrs_cutting_tool_cutterpad_model_ids')
|
||||
cutting_tool_cutterpad_model_id = fields.Many2one('sf.tool.material.search', string='刀盘型号', readonly=True,
|
||||
domain=[('cutting_tool_type', '=', '刀盘')],
|
||||
related='functional_cutting_tool_id.cutting_tool_cutterpad_model_id')
|
||||
|
||||
# 刀柄型号
|
||||
mrs_cutting_tool_cutterhandle_model_ids = fields.Many2many('sf.cutting.tool.model',
|
||||
'sf_functional_tool_warning_id',
|
||||
string='刀柄型号', readonly=True,
|
||||
domain=[('cutting_tool_type', '=', '刀柄')],
|
||||
related='functional_cutting_tool_id.mrs_cutting_tool_cutterhandle_model_ids')
|
||||
cutting_tool_cutterhandle_model_id = fields.Many2one('sf.tool.material.search', string='刀柄型号', readonly=True,
|
||||
domain=[('cutting_tool_type', '=', '刀柄')],
|
||||
related='functional_cutting_tool_id.cutting_tool_cutterhandle_model_id')
|
||||
|
||||
# 夹头型号
|
||||
mrs_cutting_tool_cutterhead_model_ids = fields.Many2many('sf.cutting.tool.model',
|
||||
'sf_functional_tool_warning_id',
|
||||
string='夹头型号', readonly=True,
|
||||
domain=[('cutting_tool_type', '=', '夹头')],
|
||||
related='functional_cutting_tool_id.mrs_cutting_tool_cutterhead_model_ids')
|
||||
# cutting_tool_material = fields.Selection([('0', '整体式刀具'), ('1', '组合式刀具')], string='刀具物料', default='0')
|
||||
#
|
||||
# @api.onchange('cutting_tool_material')
|
||||
# def _onchange_cutting_tool_material(self):
|
||||
# for record in self:
|
||||
# if record:
|
||||
# if record.cutting_tool_material == '1':
|
||||
# record.mrs_cutting_tool_integral_model_ids = None
|
||||
# if record.cutting_tool_material == '0':
|
||||
# record.mrs_cutting_tool_blade_model_ids = None
|
||||
# record.mrs_cutting_tool_cutterbar_model_ids = None
|
||||
# record.mrs_cutting_tool_cutterpad_model_ids = None
|
||||
cutting_tool_cutterhead_model_id = fields.Many2one('sf.tool.material.search', string='夹头型号', readonly=True,
|
||||
domain=[('cutting_tool_type', '=', '夹头')],
|
||||
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')],
|
||||
@@ -230,7 +197,7 @@ class FunctionalToolWarning(models.Model):
|
||||
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,
|
||||
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')
|
||||
|
||||
@@ -300,54 +267,34 @@ class RealTimeDistributionOfFunctionalTools(models.Model):
|
||||
# related='functional_cutting_tool_id.mrs_cutting_tool_type_id')
|
||||
|
||||
# 整体式刀具型号
|
||||
mrs_cutting_tool_integral_model_ids = fields.Many2many('sf.cutting.tool.model',
|
||||
'sf_functional_tool_warning_id',
|
||||
string='整体式刀具型号', readonly=True,
|
||||
domain=[
|
||||
('cutting_tool_type', '=', '整体式刀具')],
|
||||
related='functional_cutting_tool_id.mrs_cutting_tool_integral_model_ids')
|
||||
cutting_tool_integral_model_id = fields.Many2one('sf.tool.material.search', string='整体式刀具型号', readonly=True,
|
||||
domain=[('cutting_tool_type', '=', '整体式刀具')],
|
||||
related='functional_cutting_tool_id.cutting_tool_integral_model_id')
|
||||
|
||||
# 刀片型号
|
||||
mrs_cutting_tool_blade_model_ids = fields.Many2many('sf.cutting.tool.model',
|
||||
'sf_functional_tool_warning_id',
|
||||
string='刀片型号', readonly=True,
|
||||
domain=[('cutting_tool_type', '=', '刀片')],
|
||||
related='functional_cutting_tool_id.mrs_cutting_tool_blade_model_ids')
|
||||
cutting_tool_blade_model_id = fields.Many2one('sf.tool.material.search', string='刀片型号', readonly=True,
|
||||
domain=[('cutting_tool_type', '=', '刀片')],
|
||||
related='functional_cutting_tool_id.cutting_tool_blade_model_id')
|
||||
|
||||
# 刀杆型号
|
||||
mrs_cutting_tool_cutterbar_model_ids = fields.Many2many('sf.cutting.tool.model',
|
||||
'sf_functional_tool_warning_id',
|
||||
string='刀杆型号', readonly=True,
|
||||
domain=[('cutting_tool_type', '=', '刀杆')],
|
||||
related='functional_cutting_tool_id.mrs_cutting_tool_cutterbar_model_ids')
|
||||
cutting_tool_cutterbar_model_id = fields.Many2one('sf.tool.material.search', string='刀杆型号', readonly=True,
|
||||
domain=[('cutting_tool_type', '=', '刀杆')],
|
||||
related='functional_cutting_tool_id.cutting_tool_cutterbar_model_id')
|
||||
|
||||
# 刀盘型号
|
||||
mrs_cutting_tool_cutterpad_model_ids = fields.Many2many('sf.cutting.tool.model',
|
||||
'sf_functional_tool_warning_id',
|
||||
string='刀盘型号', readonly=True,
|
||||
domain=[('cutting_tool_type', '=', '刀盘')],
|
||||
related='functional_cutting_tool_id.mrs_cutting_tool_cutterpad_model_ids')
|
||||
cutting_tool_cutterpad_model_id = fields.Many2one('sf.tool.material.search', string='刀盘型号', readonly=True,
|
||||
domain=[('cutting_tool_type', '=', '刀盘')],
|
||||
related='functional_cutting_tool_id.cutting_tool_cutterpad_model_id')
|
||||
|
||||
# 刀柄型号
|
||||
mrs_cutting_tool_cutterhandle_model_ids = fields.Many2many('sf.cutting.tool.model',
|
||||
'sf_functional_tool_warning_id',
|
||||
string='刀柄型号', readonly=True,
|
||||
domain=[('cutting_tool_type', '=', '刀柄')],
|
||||
related='functional_cutting_tool_id.mrs_cutting_tool_cutterhandle_model_ids')
|
||||
cutting_tool_cutterhandle_model_id = fields.Many2one('sf.tool.material.search', string='刀柄型号', readonly=True,
|
||||
domain=[('cutting_tool_type', '=', '刀柄')],
|
||||
related='functional_cutting_tool_id.cutting_tool_cutterhandle_model_id')
|
||||
|
||||
# 夹头型号
|
||||
mrs_cutting_tool_cutterhead_model_ids = fields.Many2many('sf.cutting.tool.model',
|
||||
'sf_functional_tool_warning_id',
|
||||
string='夹头型号', readonly=True,
|
||||
domain=[('cutting_tool_type', '=', '夹头')],
|
||||
related='functional_cutting_tool_id.mrs_cutting_tool_cutterhead_model_ids')
|
||||
# cutting_tool_material = fields.Selection([('0', '整体式刀具'), ('1', '组合式刀具')], string='刀具物料', default='0')
|
||||
#
|
||||
# @api.onchange('cutting_tool_material')
|
||||
# def _onchange_cutting_tool_material(self):
|
||||
# for record in self:
|
||||
# if record:
|
||||
# if record.cutting_tool_material == '1':
|
||||
# record.mrs_cutting_tool_integral_model_ids = None
|
||||
# if record.cutting_tool_material == '0':
|
||||
# record.mrs_cutting_tool_blade_model_ids = None
|
||||
# record.mrs_cutting_tool_cutterbar_model_ids = None
|
||||
# record.mrs_cutting_tool_cutterpad_model_ids = None
|
||||
cutting_tool_cutterhead_model_id = fields.Many2one('sf.tool.material.search', string='夹头型号', readonly=True,
|
||||
domain=[('cutting_tool_type', '=', '夹头')],
|
||||
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')],
|
||||
@@ -361,7 +308,7 @@ class RealTimeDistributionOfFunctionalTools(models.Model):
|
||||
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,
|
||||
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')
|
||||
@@ -428,54 +375,34 @@ class InboundAndOutboundRecordsOfFunctionalTools(models.Model):
|
||||
name = fields.Char('名称', invisible=True, readonly=True, related='functional_cutting_tool_id.name')
|
||||
|
||||
# 整体式刀具型号
|
||||
mrs_cutting_tool_integral_model_ids = fields.Many2many('sf.cutting.tool.model',
|
||||
'sf_functional_tool_warning_id',
|
||||
string='整体式刀具型号', readonly=True,
|
||||
domain=[
|
||||
('cutting_tool_type', '=', '整体式刀具')],
|
||||
related='functional_cutting_tool_id.mrs_cutting_tool_integral_model_ids')
|
||||
cutting_tool_integral_model_id = fields.Many2one('sf.tool.material.search', string='整体式刀具型号', readonly=True,
|
||||
domain=[('cutting_tool_type', '=', '整体式刀具')],
|
||||
related='functional_cutting_tool_id.cutting_tool_integral_model_id')
|
||||
|
||||
# 刀片型号
|
||||
mrs_cutting_tool_blade_model_ids = fields.Many2many('sf.cutting.tool.model',
|
||||
'sf_functional_tool_warning_id',
|
||||
string='刀片型号', readonly=True,
|
||||
domain=[('cutting_tool_type', '=', '刀片')],
|
||||
related='functional_cutting_tool_id.mrs_cutting_tool_blade_model_ids')
|
||||
cutting_tool_blade_model_id = fields.Many2one('sf.tool.material.search', string='刀片型号', readonly=True,
|
||||
domain=[('cutting_tool_type', '=', '刀片')],
|
||||
related='functional_cutting_tool_id.cutting_tool_blade_model_id')
|
||||
|
||||
# 刀杆型号
|
||||
mrs_cutting_tool_cutterbar_model_ids = fields.Many2many('sf.cutting.tool.model',
|
||||
'sf_functional_tool_warning_id',
|
||||
string='刀杆型号', readonly=True,
|
||||
domain=[('cutting_tool_type', '=', '刀杆')],
|
||||
related='functional_cutting_tool_id.mrs_cutting_tool_cutterbar_model_ids')
|
||||
cutting_tool_cutterbar_model_id = fields.Many2one('sf.tool.material.search', string='刀杆型号', readonly=True,
|
||||
domain=[('cutting_tool_type', '=', '刀杆')],
|
||||
related='functional_cutting_tool_id.cutting_tool_cutterbar_model_id')
|
||||
|
||||
# 刀盘型号
|
||||
mrs_cutting_tool_cutterpad_model_ids = fields.Many2many('sf.cutting.tool.model',
|
||||
'sf_functional_tool_warning_id',
|
||||
string='刀盘型号', readonly=True,
|
||||
domain=[('cutting_tool_type', '=', '刀盘')],
|
||||
related='functional_cutting_tool_id.mrs_cutting_tool_cutterpad_model_ids')
|
||||
cutting_tool_cutterpad_model_id = fields.Many2one('sf.tool.material.search', string='刀盘型号', readonly=True,
|
||||
domain=[('cutting_tool_type', '=', '刀盘')],
|
||||
related='functional_cutting_tool_id.cutting_tool_cutterpad_model_id')
|
||||
|
||||
# 刀柄型号
|
||||
mrs_cutting_tool_cutterhandle_model_ids = fields.Many2many('sf.cutting.tool.model',
|
||||
'sf_functional_tool_warning_id',
|
||||
string='刀柄型号', readonly=True,
|
||||
domain=[('cutting_tool_type', '=', '刀柄')],
|
||||
related='functional_cutting_tool_id.mrs_cutting_tool_cutterhandle_model_ids')
|
||||
cutting_tool_cutterhandle_model_id = fields.Many2one('sf.tool.material.search', string='刀柄型号', readonly=True,
|
||||
domain=[('cutting_tool_type', '=', '刀柄')],
|
||||
related='functional_cutting_tool_id.cutting_tool_cutterhandle_model_id')
|
||||
|
||||
# 夹头型号
|
||||
mrs_cutting_tool_cutterhead_model_ids = fields.Many2many('sf.cutting.tool.model',
|
||||
'sf_functional_tool_warning_id',
|
||||
string='夹头型号', readonly=True,
|
||||
domain=[('cutting_tool_type', '=', '夹头')],
|
||||
related='functional_cutting_tool_id.mrs_cutting_tool_cutterhead_model_ids')
|
||||
# cutting_tool_material = fields.Selection([('0', '整体式刀具'), ('1', '组合式刀具')], string='刀具物料', default='0')
|
||||
#
|
||||
# @api.onchange('cutting_tool_material')
|
||||
# def _onchange_cutting_tool_material(self):
|
||||
# for record in self:
|
||||
# if record:
|
||||
# if record.cutting_tool_material == '1':
|
||||
# record.mrs_cutting_tool_integral_model_ids = None
|
||||
# if record.cutting_tool_material == '0':
|
||||
# record.mrs_cutting_tool_blade_model_ids = None
|
||||
# record.mrs_cutting_tool_cutterbar_model_ids = None
|
||||
# record.mrs_cutting_tool_cutterpad_model_ids = None
|
||||
cutting_tool_cutterhead_model_id = fields.Many2one('sf.tool.material.search', string='夹头型号', readonly=True,
|
||||
domain=[('cutting_tool_type', '=', '夹头')],
|
||||
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')],
|
||||
@@ -489,7 +416,7 @@ class InboundAndOutboundRecordsOfFunctionalTools(models.Model):
|
||||
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,
|
||||
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')
|
||||
@@ -549,11 +476,24 @@ class MachineTableToolChangingApply(models.Model):
|
||||
# string='换刀需求信息',
|
||||
# attrs="{'invisible': 1}")
|
||||
|
||||
name = fields.Many2one('maintenance.equipment', string='CNC机床',required=True, readonly=False,
|
||||
name = fields.Many2one('maintenance.equipment', string='CNC机床', required=True, readonly=False,
|
||||
group_expand='_read_group_names')
|
||||
machine_table_type_id = fields.Many2one('maintenance.equipment.category', string='机床类型', readonly=True,
|
||||
compute='_compute_name')
|
||||
machine_tool_code = fields.Char(string='机台号', invisible=True, readonly=True, compute='_compute_name')
|
||||
compute='_compute_machine_table_type_id')
|
||||
machine_tool_code = fields.Char(string='机台号', invisible=True, readonly=True, compute='_compute_machine_tool_code')
|
||||
|
||||
@api.depends('name')
|
||||
def _compute_machine_table_type_id(self):
|
||||
for record in self:
|
||||
if record:
|
||||
record.machine_table_type_id = record.name.category_id.id
|
||||
|
||||
@api.depends('name')
|
||||
def _compute_machine_tool_code(self):
|
||||
for record in self:
|
||||
if record:
|
||||
record.machine_tool_code = record.name.code
|
||||
|
||||
cutter_spacing_code = fields.Char(string='刀位号', readonly=False)
|
||||
functional_tool_code = fields.Char(string='功能刀具编码', readonly=True, compute='_compute_functional_tool_name_id')
|
||||
functional_tool_name_id = fields.Many2one('sf.functional.cutting.tool', string='功能刀具名称', readonly=False)
|
||||
@@ -591,13 +531,6 @@ class MachineTableToolChangingApply(models.Model):
|
||||
names = categories._search([], order=order, access_rights_uid=SUPERUSER_ID)
|
||||
return categories.browse(names)
|
||||
|
||||
@api.depends('name')
|
||||
def _compute_name(self):
|
||||
for record in self:
|
||||
if record:
|
||||
record.machine_table_type_id = record.name.category_id.id
|
||||
record.machine_tool_code = record.name.code
|
||||
|
||||
@api.depends('functional_tool_name_id')
|
||||
def _compute_functional_tool_name_id(self):
|
||||
for record in self:
|
||||
@@ -613,7 +546,7 @@ class MachineTableToolChangingApply(models.Model):
|
||||
"""
|
||||
# 更新数据到机台换刀申请界面
|
||||
# todo 自动换刀申请条件需补充完善
|
||||
if (self.functional_tool_status == '异常'):
|
||||
if self.functional_tool_status == '异常':
|
||||
self.env['sf.machine.table.tool.changing.apply'].search([
|
||||
('name', '=', self.name.id)]).write({
|
||||
'replacement_tool_code': self.functional_tool_code,
|
||||
@@ -767,8 +700,8 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
|
||||
# 将计划执行状态改为执行中
|
||||
self.env['sf.cam.work.order.program.knife.plan'].search(
|
||||
[('functional_tool_code', '=', self.functional_tool_code)]).write({
|
||||
'plan_execute_status': '1',
|
||||
'applicant': self.env.user.name})
|
||||
'plan_execute_status': '1',
|
||||
'applicant': self.env.user.name})
|
||||
|
||||
def revocation(self):
|
||||
"""
|
||||
@@ -782,10 +715,10 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
|
||||
# 将计划执行状态改为待执行，同时清除申请人、功能刀具组装字段数据
|
||||
self.env['sf.cam.work.order.program.knife.plan'].search(
|
||||
[('functional_tool_code', '=', self.functional_tool_code)]).write({
|
||||
'plan_execute_status': '0',
|
||||
'applicant': None,
|
||||
'sf_functional_tool_assembly_id': None,
|
||||
})
|
||||
'plan_execute_status': '0',
|
||||
'applicant': None,
|
||||
'sf_functional_tool_assembly_id': None,
|
||||
})
|
||||
|
||||
def open_sf_functional_tool_assembly(self):
|
||||
"""
|
||||
@@ -806,7 +739,7 @@ class FunctionalToolAssembly(models.Model):
|
||||
functional_tool_code = fields.Char(string='功能刀具编码', readonly=True)
|
||||
name = fields.Many2one('sf.functional.cutting.tool', string='功能刀具名称', readonly=True)
|
||||
functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True,
|
||||
group_expand='_read_group_functional_tool_type_ids')
|
||||
group_expand='_read_group_functional_tool_type_ids')
|
||||
|
||||
@api.model
|
||||
def _read_group_functional_tool_type_ids(self, categories, domain, order):
|
||||
@@ -819,46 +752,39 @@ class FunctionalToolAssembly(models.Model):
|
||||
functional_tool_cutting_type = fields.Char(string='功能刀具切削类型', readonly=False)
|
||||
|
||||
# 整体式刀具型号
|
||||
mrs_cutting_tool_integral_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_assembly_id',
|
||||
string='整体式刀具型号', readonly=True, domain=
|
||||
[('cutting_tool_type', '=', '整体式刀具')])
|
||||
cutting_tool_integral_model_id = fields.Many2one('sf.tool.material.search', string='整体式刀具型号', readonly=True,
|
||||
domain=[('cutting_tool_type', '=', '整体式刀具')])
|
||||
integral_code = fields.Char('整体式刀具序列号', readonly=True)
|
||||
integral_name = fields.Char('整体式刀具名称', readonly=True)
|
||||
sf_tool_brand_id_1 = fields.Many2one('sf.machine.brand', '整体式刀具品牌', readonly=True)
|
||||
# 刀片型号
|
||||
mrs_cutting_tool_blade_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_assembly_id',
|
||||
string='刀片型号', readonly=True, domain=
|
||||
[('cutting_tool_type', '=', '刀片')])
|
||||
cutting_tool_blade_model_id = fields.Many2one('sf.tool.material.search', string='刀片型号', readonly=True,
|
||||
domain=[('cutting_tool_type', '=', '刀片')])
|
||||
blade_code = fields.Char('刀片序列号', readonly=True)
|
||||
blade_name = fields.Char('刀片名称', readonly=True)
|
||||
sf_tool_brand_id_2 = fields.Many2one('sf.machine.brand', '刀片品牌', readonly=True)
|
||||
# 刀杆型号
|
||||
mrs_cutting_tool_cutterbar_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_assembly_id',
|
||||
string='刀杆型号', readonly=True, domain=
|
||||
[('cutting_tool_type', '=', '刀杆')])
|
||||
cutting_tool_cutterbar_model_id = fields.Many2one('sf.tool.material.search', string='刀杆型号', readonly=True,
|
||||
domain=[('cutting_tool_type', '=', '刀杆')])
|
||||
bar_code = fields.Char('刀杆序列号', readonly=True)
|
||||
bar_name = fields.Char('刀杆名称', readonly=True)
|
||||
sf_tool_brand_id_3 = fields.Many2one('sf.machine.brand', '刀杆品牌', readonly=True)
|
||||
# 刀盘型号
|
||||
mrs_cutting_tool_cutterpad_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_assembly_id',
|
||||
string='刀盘型号', readonly=True, domain=
|
||||
[('cutting_tool_type', '=', '刀盘')])
|
||||
cutting_tool_cutterpad_model_id = fields.Many2one('sf.tool.material.search', string='刀盘型号', readonly=True,
|
||||
domain=[('cutting_tool_type', '=', '刀盘')])
|
||||
pad_code = fields.Char('刀盘序列号', readonly=True)
|
||||
pad_name = fields.Char('刀盘名称', readonly=True)
|
||||
sf_tool_brand_id_4 = fields.Many2one('sf.machine.brand', '刀盘品牌', readonly=True)
|
||||
|
||||
# 刀柄型号
|
||||
mrs_cutting_tool_cutterhandle_model_ids = fields.Many2many('sf.cutting.tool.model',
|
||||
'sf_functional_tool_assembly_id',
|
||||
string='刀柄型号', readonly=True, domain=
|
||||
[('cutting_tool_type', '=', '刀柄')])
|
||||
cutting_tool_cutterhandle_model_id = fields.Many2one('sf.tool.material.search', string='刀柄型号', readonly=True,
|
||||
domain=[('cutting_tool_type', '=', '刀柄')])
|
||||
handle_code = fields.Char('刀柄序列号', readonly=True)
|
||||
handle_name = fields.Char('刀柄名称', readonly=True)
|
||||
sf_tool_brand_id_5 = fields.Many2one('sf.machine.brand', '刀柄品牌', readonly=True)
|
||||
# 夹头型号
|
||||
mrs_cutting_tool_cutterhead_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_assembly_id',
|
||||
string='夹头型号', readonly=True, domain=
|
||||
[('cutting_tool_type', '=', '夹头')])
|
||||
cutting_tool_cutterhead_model_id = fields.Many2one('sf.tool.material.search', string='夹头型号', readonly=True,
|
||||
domain=[('cutting_tool_type', '=', '夹头')])
|
||||
chuck_code = fields.Char('夹头序列号', readonly=True)
|
||||
chuck_name = fields.Char('夹头名称', readonly=True)
|
||||
sf_tool_brand_id_6 = fields.Many2one('sf.machine.brand', '夹头品牌', readonly=True)
|
||||
@@ -932,72 +858,65 @@ class FunctionalToolAssembly(models.Model):
|
||||
# 获取功能刀具缓存信息
|
||||
record = self.env['sf.functional.cutting.tool.entity.cache'].search([
|
||||
('code', '=', self.functional_tool_code)], limit=1)
|
||||
# 删除现有功能刀具列表记录
|
||||
# # 删除现有功能刀具列表记录
|
||||
# self.env['sf.functional.cutting.tool.entity'].search([
|
||||
# ('code', '=', self.functional_tool_code)]).unlink()
|
||||
# 修改功能刀具列表信息
|
||||
self.env['sf.functional.cutting.tool.entity'].search([
|
||||
('code', '=', self.functional_tool_code)]).unlink()
|
||||
# 创建新的功能刀具列表信息
|
||||
self.env['sf.functional.cutting.tool.entity'].create({
|
||||
'code': record.code,
|
||||
'name': record.name,
|
||||
'mrs_cutting_tool_type_id': record.mrs_cutting_tool_type_id.id,
|
||||
'mrs_cutting_tool_model_id': record.mrs_cutting_tool_model_id.id,
|
||||
'mrs_cutting_tool_integral_model_ids': record.mrs_cutting_tool_integral_model_ids.ids,
|
||||
'mrs_cutting_tool_blade_model_ids': record.mrs_cutting_tool_blade_model_ids.ids,
|
||||
'mrs_cutting_tool_cutterbar_model_ids': record.mrs_cutting_tool_cutterbar_model_ids.ids,
|
||||
'mrs_cutting_tool_cutterpad_model_ids': record.mrs_cutting_tool_cutterpad_model_ids.ids,
|
||||
'mrs_cutting_tool_cutterhandle_model_ids': record.mrs_cutting_tool_cutterhandle_model_ids.ids,
|
||||
'mrs_cutting_tool_cutterhead_model_ids': record.mrs_cutting_tool_cutterhead_model_ids.ids,
|
||||
'diameter': record.diameter,
|
||||
'tool_grade': record.tool_grade,
|
||||
'machining_accuracy': record.machining_accuracy,
|
||||
'tool_length': record.tool_length,
|
||||
'blade_number': record.blade_number,
|
||||
'integral_blade_length': record.integral_blade_length,
|
||||
'effective_blade_length': record.effective_blade_length,
|
||||
'max_life': record.max_life,
|
||||
'is_standard': record.is_standard,
|
||||
'applicable_range': record.applicable_range,
|
||||
'image': record.image,
|
||||
})
|
||||
# 删除缓存信息
|
||||
('code', '=', self.functional_tool_code)]).sudo().write({
|
||||
'code': record.code,
|
||||
'name': record.name,
|
||||
'mrs_cutting_tool_type_id': record.mrs_cutting_tool_type_id.id,
|
||||
'mrs_cutting_tool_model_id': record.mrs_cutting_tool_model_id.id,
|
||||
'cutting_tool_integral_model_id': record.cutting_tool_integral_model_id.id,
|
||||
'cutting_tool_blade_model_id': record.cutting_tool_blade_model_id.id,
|
||||
'cutting_tool_cutterbar_model_id': record.cutting_tool_cutterbar_model_id.id,
|
||||
'cutting_tool_cutterpad_model_id': record.cutting_tool_cutterpad_model_id.id,
|
||||
'cutting_tool_cutterhandle_model_id': record.cutting_tool_cutterhandle_model_id.id,
|
||||
'cutting_tool_cutterhead_model_id': record.cutting_tool_cutterhead_model_id.id,
|
||||
'diameter': record.diameter,
|
||||
'tool_grade': record.tool_grade,
|
||||
'machining_accuracy': record.machining_accuracy,
|
||||
'tool_length': record.tool_length,
|
||||
'blade_number': record.blade_number,
|
||||
'integral_blade_length': record.integral_blade_length,
|
||||
'effective_blade_length': record.effective_blade_length,
|
||||
'max_life': record.max_life,
|
||||
'is_standard': record.is_standard,
|
||||
'applicable_range': record.applicable_range,
|
||||
'image': record.image,
|
||||
})
|
||||
# 删除功能刀具缓存信息
|
||||
self.env['sf.functional.cutting.tool.entity.cache'].search([
|
||||
('code', '=', self.functional_tool_code)]).unlink()
|
||||
|
||||
# # 删除功能刀具预警、实时分布、出入库记录的新记录
|
||||
# self.env['sf.functional.tool.warning'].search([
|
||||
# ('code', '=', self.functional_tool_code)]).unlink()
|
||||
# self.env['sf.real.time.distribution.of.functional.tools'].search([
|
||||
# ('code', '=', self.functional_tool_code)]).unlink()
|
||||
# self.env['sf.inbound.and.outbound.records.of.functional.tools'].search([
|
||||
# ('code', '=', self.functional_tool_code)]).unlink()
|
||||
|
||||
# 修改功能刀具组装的组装信息
|
||||
self.env['sf.functional.tool.assembly'].search([
|
||||
('machine_tool_name_id', '=', self.machine_tool_name_id.id),
|
||||
('cutter_spacing_code', '=', self.cutter_spacing_code),
|
||||
('assemble_status', '=', '1')
|
||||
]).write({
|
||||
'mrs_cutting_tool_integral_model_ids': None,
|
||||
'cutting_tool_integral_model_id': None,
|
||||
'integral_code': None,
|
||||
'integral_name': None,
|
||||
'sf_tool_brand_id_1': None,
|
||||
'mrs_cutting_tool_blade_model_ids': None,
|
||||
'cutting_tool_blade_model_id': None,
|
||||
'blade_code': None,
|
||||
'blade_name': None,
|
||||
'sf_tool_brand_id_2': None,
|
||||
'mrs_cutting_tool_cutterbar_model_ids': None,
|
||||
'cutting_tool_cutterbar_model_id': None,
|
||||
'bar_code': None,
|
||||
'bar_name': None,
|
||||
'sf_tool_brand_id_3': None,
|
||||
'mrs_cutting_tool_cutterpad_model_ids': None,
|
||||
'cutting_tool_cutterpad_model_id': None,
|
||||
'pad_code': None,
|
||||
'pad_name': None,
|
||||
'sf_tool_brand_id_4': None,
|
||||
'mrs_cutting_tool_cutterhandle_model_ids': None,
|
||||
'cutting_tool_cutterhandle_model_id': None,
|
||||
'handle_code': None,
|
||||
'handle_name': None,
|
||||
'sf_tool_brand_id_5': None,
|
||||
'mrs_cutting_tool_cutterhead_model_ids': None,
|
||||
'cutting_tool_cutterhead_model_id': None,
|
||||
'chuck_code': None,
|
||||
'chuck_name': None,
|
||||
'sf_tool_brand_id_6': None,
|
||||
|
||||
Reference in New Issue
Block a user