jikimo/test
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/刀具物料与夹具物料的反注册

Browse Source 
# Conflicts:
#	sf_base/views/base_view.xml
#	sf_base/views/common_view.xml
#	sf_tool_management/models/base.py
This commit is contained in:
jinling.yang
2023-08-17 18:09:19 +08:00
parent 97fcf6d91f ae07a515b7
commit 3cef87ea46
30 changed files with 1483 additions and 1122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
sf_tool_management/models/base.py
View File

@@ -52,17 +52,30 @@ class FunctionalCuttingToolEntity(models.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
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('装刀长')
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.Boolean('是否标准刀')
is_standard = fields.Selection([('1', '是'), ('0', '否')], '是否标准刀')
applicable_range = fields.Char('适用范围')
image = fields.Binary('图片')
@@ -113,17 +126,30 @@ class FunctionalCuttingToolEntityCache(models.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
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('装刀长')
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.Boolean('是否标准刀')
is_standard = fields.Selection([('1', '是'), ('0', '否')], '是否标准刀')
applicable_range = fields.Char('适用范围')
image = fields.Binary('图片')
@@ -177,20 +203,35 @@ class FunctionalToolWarning(models.Model):
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
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, related='functional_cutting_tool_id.tool_grade')
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.Boolean('是否标准刀', readonly=True, related='functional_cutting_tool_id.is_standard')
is_standard = fields.Selection([('1', '是'), ('0', '否')],'是否标准刀', readonly=True, related='functional_cutting_tool_id.is_standard')
applicable_range = fields.Char('适用范围', readonly=True, related='functional_cutting_tool_id.applicable_range')
image = fields.Binary('图片', readonly=True, related='functional_cutting_tool_id.image')
@@ -210,6 +251,7 @@ class FunctionalToolWarning(models.Model):
machine_tool_code = fields.Char('机台号', readonly=True, related='functional_tool_assembly_id.machine_tool_code')
cutting_tool_code = fields.Char('刀位号', readonly=True, related='functional_tool_assembly_id.cutter_spacing_code')
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)
@@ -287,20 +329,32 @@ class RealTimeDistributionOfFunctionalTools(models.Model):
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
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, related='functional_cutting_tool_id.tool_grade')
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.Boolean('是否标准刀', readonly=True, related='functional_cutting_tool_id.is_standard')
is_standard = fields.Selection([('1', '是'), ('0', '否')],'是否标准刀', readonly=True, related='functional_cutting_tool_id.is_standard')
applicable_range = fields.Char('适用范围', readonly=True, related='functional_cutting_tool_id.applicable_range')
image = fields.Binary('图片', readonly=True, related='functional_cutting_tool_id.image')
@@ -396,20 +450,32 @@ class InboundAndOutboundRecordsOfFunctionalTools(models.Model):
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
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, related='functional_cutting_tool_id.tool_grade')
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.Boolean('是否标准刀', readonly=True, related='functional_cutting_tool_id.is_standard')
is_standard = fields.Selection([('1', '是'), ('0', '否')],'是否标准刀', readonly=True, related='functional_cutting_tool_id.is_standard')
applicable_range = fields.Char('适用范围', readonly=True, related='functional_cutting_tool_id.applicable_range')
image = fields.Binary('图片', readonly=True, related='functional_cutting_tool_id.image')
@@ -462,7 +528,8 @@ class MachineTableToolChangingApply(models.Model):
# string='换刀需求信息',
# attrs="{'invisible': 1}")
name = fields.Many2one('maintenance.equipment', string='CNC机床', readonly=False, tracking=True,
name = fields.Many2one('maintenance.equipment', string='CNC机床',required=True, readonly=False, tracking=True,
group_expand='_read_group_names')
machine_table_type_id = fields.Many2one('sf.machine_tool.category', string='机床类型', readonly=True,
compute='_compute_name')
@@ -472,7 +539,8 @@ class MachineTableToolChangingApply(models.Model):
functional_tool_name_id = fields.Many2one('sf.functional.cutting.tool', string='功能刀具名称', readonly=False)
functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True,
compute='_compute_functional_tool_name_id')
diameter = fields.Char(string='直径', readonly=False)
diameter = fields.Char(string='直径(mm)', readonly=False)
coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=False)
hilt_name = fields.Char(string='刀柄名称', readonly=False)
hilt_code = fields.Char(string='刀柄编号', readonly=False)
@@ -633,9 +701,9 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
return categories.browse(machine_table_name_ids)
machine_tool_cutter_spacing_code = fields.Char(string='机床刀位号', readonly=False)
diameter = fields.Char(string='直径（程式）', readonly=False)
tool_loading_length = fields.Char(string='装刀长', readonly=False)
clearance_length = fields.Char(string='避空长', readonly=False)
diameter = fields.Char(string='直径（程式）(mm)', readonly=False)
tool_loading_length = fields.Char(string='装刀长(mm)', readonly=False)
clearance_length = fields.Char(string='避空长(mm)', readonly=False)
tool_included_angle = fields.Char(string='刀尖角（R角）', readonly=False)
L_D = fields.Char(string='L/D', readonly=False)
coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=False,
@@ -726,8 +794,8 @@ class FunctionalToolAssembly(models.Model):
functional_tool_type_ids = categories._search([], order=order, access_rights_uid=SUPERUSER_ID)
return categories.browse(functional_tool_type_ids)
functional_tool_diameter = fields.Char(string='功能刀具直径', readonly=True)
functional_tool_length = fields.Char(string='功能刀具伸出长', readonly=True)
functional_tool_diameter = fields.Char(string='功能刀具直径(mm)', readonly=True)
functional_tool_length = fields.Char(string='功能刀具伸出长(mm)', readonly=True)
functional_tool_cutting_type = fields.Char(string='功能刀具切削类型', readonly=False)
# 整体式刀具型号
@@ -776,11 +844,11 @@ class FunctionalToolAssembly(models.Model):
sf_tool_brand_id_6 = fields.Many2one('sf.machine.brand', '夹头品牌', readonly=True)
coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=True)
tool_loading_length = fields.Char(string='装刀长', readonly=True)
tool_loading_length = fields.Char(string='装刀长(mm)', readonly=True)
new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧', readonly=True)
reference_length = fields.Char(string='参考伸出长', readonly=True)
reference_length = fields.Char(string='参考伸出长(mm)', readonly=True)
cut_time = fields.Char(string='已切削时间', readonly=True)
cut_length = fields.Char(string='已切削长度', readonly=True)
cut_length = fields.Char(string='已切削长度(mm)', readonly=True)
cut_number = fields.Char(string='已切削次数', readonly=True)
loading_task_source = fields.Selection([('0', 'CAM装刀'), ('1', '机台换刀')], string='装刀任务来源', readonly=True)