1、功能刀具列表模型新增部分字段;2、机台换刀申请新增根据报警值和有效值计算当前状态,重构根据状态自动换刀申请的功能,重构撤销换刀申请功能;3、功能刀具组装单模型新增大量字段,优化tree视图和form视图的布局;4、组装单弹窗模型新增大量字段,优化确认组装按键功能,
This commit is contained in:
@@ -1,4 +1,6 @@
|
|||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
from datetime import timedelta
|
||||||
|
|
||||||
from odoo import fields, models, api
|
from odoo import fields, models, api
|
||||||
from odoo import SUPERUSER_ID
|
from odoo import SUPERUSER_ID
|
||||||
from odoo.exceptions import ValidationError
|
from odoo.exceptions import ValidationError
|
||||||
@@ -14,13 +16,29 @@ class FunctionalCuttingToolEntity(models.Model):
|
|||||||
_description = '功能刀具列表'
|
_description = '功能刀具列表'
|
||||||
|
|
||||||
# code = fields.Char('序列号')
|
# code = fields.Char('序列号')
|
||||||
|
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)
|
barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True)
|
||||||
name = fields.Char(related='barcode_id.name')
|
|
||||||
functional_tool_name_id = fields.Many2one('product.product', string='功能刀具名称', readonly=True)
|
|
||||||
mrs_cutting_tool_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀具型号')
|
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='功能刀具类型',
|
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)
|
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)
|
||||||
|
coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=True)
|
||||||
|
new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧', readonly=True)
|
||||||
|
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='机内刀库数量')
|
||||||
|
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='正常')
|
||||||
|
|
||||||
@api.model
|
@api.model
|
||||||
def _read_group_mrs_cutting_tool_type_id(self, categories, domain, order):
|
def _read_group_mrs_cutting_tool_type_id(self, categories, domain, order):
|
||||||
mrs_cutting_tool_type_ids = categories._search([], order=order, access_rights_uid=SUPERUSER_ID)
|
mrs_cutting_tool_type_ids = categories._search([], order=order, access_rights_uid=SUPERUSER_ID)
|
||||||
@@ -175,7 +193,7 @@ class FunctionalToolWarning(models.Model):
|
|||||||
self.is_standard = self.functional_cutting_tool_id.is_standard
|
self.is_standard = self.functional_cutting_tool_id.is_standard
|
||||||
|
|
||||||
# 功能刀具预警 特有字段
|
# 功能刀具预警 特有字段
|
||||||
outbound_time = fields.Datetime('出库时间', readonly=True, related='functional_tool_assembly_id.receive_time')
|
outbound_time = fields.Datetime('出库时间', readonly=True)
|
||||||
on_board_time = fields.Datetime('上机时间', readonly=False)
|
on_board_time = fields.Datetime('上机时间', readonly=False)
|
||||||
machine_table_name_id = fields.Many2one('maintenance.equipment', string='机床名称', readonly=True,
|
machine_table_name_id = fields.Many2one('maintenance.equipment', string='机床名称', readonly=True,
|
||||||
group_expand='_read_group_machine_table_name_ids')
|
group_expand='_read_group_machine_table_name_ids')
|
||||||
@@ -462,18 +480,18 @@ class MachineTableToolChangingApply(models.Model):
|
|||||||
tool_position_interface_type = fields.Selection(
|
tool_position_interface_type = fields.Selection(
|
||||||
[('BT刀柄式', 'BT刀柄式'), ('SK刀柄式', 'SK刀柄式'), ('HSK刀柄式', 'HSK刀柄式'),
|
[('BT刀柄式', 'BT刀柄式'), ('SK刀柄式', 'SK刀柄式'), ('HSK刀柄式', 'HSK刀柄式'),
|
||||||
('CAT刀柄式', 'CAT刀柄式'), ('ISO刀盘式', 'ISO刀盘式'), ('DIN刀盘式', 'DIN刀盘式'),
|
('CAT刀柄式', 'CAT刀柄式'), ('ISO刀盘式', 'ISO刀盘式'), ('DIN刀盘式', 'DIN刀盘式'),
|
||||||
('直装固定式', '直装固定式')], string='刀位接口型号', requried=True)
|
('直装固定式', '直装固定式')], string='刀位接口型号', required=True)
|
||||||
diameter = fields.Integer(string='刀具直径(mm)', requried=True)
|
diameter = fields.Integer(string='刀具直径(mm)', )
|
||||||
knife_tip_r_angle = fields.Float(string='刀尖R角(mm)', requried=True)
|
knife_tip_r_angle = fields.Float(string='刀尖R角(mm)')
|
||||||
max_lifetime_value = fields.Integer(string='最大寿命值(min)', requried=True)
|
max_lifetime_value = fields.Integer(string='最大寿命值(min)')
|
||||||
alarm_value = fields.Integer(string='报警值(min)', requried=True)
|
alarm_value = fields.Integer(string='报警值(min)')
|
||||||
used_value = fields.Integer(string='已使用值(min)', requried=True)
|
used_value = fields.Integer(string='已使用值(min)')
|
||||||
whether_standard_knife = fields.Boolean(string='是否标准刀', default=True)
|
whether_standard_knife = fields.Boolean(string='是否标准刀', default=True)
|
||||||
extension_length = fields.Float(string='伸出长(mm)', requried=True)
|
extension_length = fields.Float(string='伸出长(mm)')
|
||||||
effective_length = fields.Float(string='有效长(mm)', requried=True)
|
effective_length = fields.Float(string='有效长(mm)')
|
||||||
|
|
||||||
functional_tool_status = fields.Selection([('正常', '正常'), ('报警', '报警')], string='功能刀具状态',
|
functional_tool_status = fields.Selection([('正常', '正常'), ('报警', '报警')], string='功能刀具状态', store=True,
|
||||||
default='正常')
|
default='正常', compute='_compute_functional_tool_status')
|
||||||
|
|
||||||
assembly_order_code = fields.Char(string='组装单编码', readonly=True)
|
assembly_order_code = fields.Char(string='组装单编码', readonly=True)
|
||||||
applicant = fields.Char(string='申请人', readonly=True)
|
applicant = fields.Char(string='申请人', readonly=True)
|
||||||
@@ -485,6 +503,14 @@ class MachineTableToolChangingApply(models.Model):
|
|||||||
|
|
||||||
sf_functional_tool_assembly_id = fields.Many2one('sf.functional.tool.assembly', '功能刀具组装单', readonly=True)
|
sf_functional_tool_assembly_id = fields.Many2one('sf.functional.tool.assembly', '功能刀具组装单', readonly=True)
|
||||||
|
|
||||||
|
@api.depends('alarm_value', 'used_value')
|
||||||
|
def _compute_functional_tool_status(self):
|
||||||
|
for record in self:
|
||||||
|
if record.alarm_value <= record.used_value:
|
||||||
|
record.functional_tool_status = '报警'
|
||||||
|
else:
|
||||||
|
record.functional_tool_status = '正常'
|
||||||
|
|
||||||
@api.depends('maintenance_equipment_id')
|
@api.depends('maintenance_equipment_id')
|
||||||
def _compute_machine_table_type_id(self):
|
def _compute_machine_table_type_id(self):
|
||||||
for record in self:
|
for record in self:
|
||||||
@@ -511,54 +537,57 @@ class MachineTableToolChangingApply(models.Model):
|
|||||||
names = categories._search([], order=order, access_rights_uid=SUPERUSER_ID)
|
names = categories._search([], order=order, access_rights_uid=SUPERUSER_ID)
|
||||||
return categories.browse(names)
|
return categories.browse(names)
|
||||||
|
|
||||||
@api.onchange('functional_tool_status')
|
@api.constrains('functional_tool_status')
|
||||||
def automation_apply_for_tool_change(self):
|
def automation_apply_for_tool_change(self):
|
||||||
"""
|
"""
|
||||||
自动申请换刀
|
自动申请换刀
|
||||||
:return:
|
:return:
|
||||||
"""
|
"""
|
||||||
# 更新数据到机台换刀申请界面
|
# 更新数据到机台换刀申请界面
|
||||||
# todo 自动换刀申请条件需补充完善
|
if self.functional_tool_status == '报警' and self.sf_functional_tool_assembly_id == False:
|
||||||
if self.functional_tool_status == '报警':
|
machine_table_tool_changing_apply = self.env['sf.machine.table.tool.changing.apply'].search(
|
||||||
self.env['sf.machine.table.tool.changing.apply'].search([
|
[('maintenance_equipment_id', '=', self.maintenance_equipment_id.id),
|
||||||
('name', '=', self.name.id)]).write({
|
('cutter_spacing_code_id', '=', self.cutter_spacing_code_id.id)
|
||||||
'replacement_tool_name_id': self.functional_tool_name_id.id,
|
])
|
||||||
'replacement_tool_type_id': self.functional_tool_type_id.id,
|
|
||||||
'replacement_tool_coarse_middle_thin': self.coarse_middle_thin,
|
|
||||||
'new_former': '0',
|
|
||||||
'applicant': '自动申请',
|
|
||||||
'used_tool_time': fields.Datetime.now(),
|
|
||||||
'reason_for_applying': '功能刀具状态异常',
|
|
||||||
'remark': None,
|
|
||||||
'status': '1'
|
|
||||||
})
|
|
||||||
|
|
||||||
# 新建组装任务
|
# 新建组装任务
|
||||||
self.env['sf.functional.tool.assembly'].create({
|
sf_functional_tool_assembly = self.env['sf.functional.tool.assembly'].create({
|
||||||
'name': self.functional_tool_name_id,
|
'functional_tool_name': self.functional_tool_name,
|
||||||
'functional_tool_type_id': self.functional_tool_type_id.id,
|
'functional_tool_type_id': self.functional_tool_type_id.id,
|
||||||
'functional_tool_diameter': self.diameter,
|
'functional_tool_diameter': self.diameter,
|
||||||
|
'knife_tip_r_angle': self.knife_tip_r_angle,
|
||||||
|
'coarse_middle_thin': '3',
|
||||||
|
'new_former': '0',
|
||||||
|
'functional_tool_length': self.extension_length,
|
||||||
|
'effective_length': self.effective_length,
|
||||||
'loading_task_source': '1',
|
'loading_task_source': '1',
|
||||||
'applicant': '自动申请',
|
'use_tool_time': fields.Datetime.now() + timedelta(hours=4),
|
||||||
'reason_for_applying': '功能刀具状态异常',
|
'production_line_name_id': self.production_line_id.id,
|
||||||
'use_tool_time': self.used_tool_time,
|
'machine_tool_name_id': self.maintenance_equipment_id.id,
|
||||||
'machine_tool_name': self.CNC_machine_table,
|
'applicant': self.applicant,
|
||||||
'machine_tool_code': self.machine_tool_code,
|
'apply_time': fields.Datetime.now(),
|
||||||
'cutter_spacing_code_id': self.cutter_spacing_code_id,
|
'cutter_spacing_code_id': self.cutter_spacing_code_id.id,
|
||||||
|
'whether_standard_knife': self.whether_standard_knife,
|
||||||
|
'reason_for_applying': '机台报警自动换刀',
|
||||||
|
'sf_machine_table_tool_changing_apply_id': self.id
|
||||||
})
|
})
|
||||||
|
|
||||||
def new_assembly_task(self, vals):
|
machine_table_tool_changing_apply.write(
|
||||||
"""
|
{'status': '1',
|
||||||
新建组装任务
|
'sf_functional_tool_assembly_id': sf_functional_tool_assembly})
|
||||||
:param vals:
|
|
||||||
:return:
|
|
||||||
"""
|
|
||||||
# 增加设置直径的值
|
|
||||||
tool_changing_apply = self.env['sf.machine.table.tool.changing.apply'].search(
|
|
||||||
[('name', '=', vals['name'])])
|
|
||||||
vals['functional_tool_diameter'] = tool_changing_apply.diameter
|
|
||||||
|
|
||||||
self.env['sf.functional.tool.assembly'].create(vals)
|
# def new_assembly_task(self, vals):
|
||||||
|
# """
|
||||||
|
# 新建组装任务
|
||||||
|
# :param vals:
|
||||||
|
# :return:
|
||||||
|
# """
|
||||||
|
# # 增加设置直径的值
|
||||||
|
# tool_changing_apply = self.env['sf.machine.table.tool.changing.apply'].search(
|
||||||
|
# [('name', '=', vals['name'])])
|
||||||
|
# vals['functional_tool_diameter'] = tool_changing_apply.diameter
|
||||||
|
#
|
||||||
|
# self.env['sf.functional.tool.assembly'].create(vals)
|
||||||
|
|
||||||
def revocation_1(self):
|
def revocation_1(self):
|
||||||
"""
|
"""
|
||||||
@@ -567,21 +596,15 @@ class MachineTableToolChangingApply(models.Model):
|
|||||||
"""
|
"""
|
||||||
# 撤回功能刀具组装创建的任务
|
# 撤回功能刀具组装创建的任务
|
||||||
self.env['sf.functional.tool.assembly'].search(
|
self.env['sf.functional.tool.assembly'].search(
|
||||||
[('assembly_order_code', '=', self.assembly_order_code),
|
[('id', '=', self.sf_functional_tool_assembly_id.id),
|
||||||
('loading_task_source', '=', '1')]).unlink()
|
('loading_task_source', '=', '1')]).unlink()
|
||||||
|
|
||||||
# 撤回数据更新
|
# 撤回数据更新
|
||||||
self.env['sf.machine.table.tool.changing.apply'].search([('name', '=', self.name.id)]).write({
|
self.env['sf.machine.table.tool.changing.apply'].search(
|
||||||
'replacement_tool_name_id': None,
|
[('maintenance_equipment_id', '=', self.maintenance_equipment_id.id),
|
||||||
'replacement_tool_type_id': None,
|
('cutter_spacing_code_id', '=', self.cutter_spacing_code_id.id)]).write(
|
||||||
'replacement_tool_coarse_middle_thin': None,
|
{'status': '0',
|
||||||
'new_former': None,
|
'sf_functional_tool_assembly_id': None
|
||||||
'applicant': None,
|
|
||||||
'used_tool_time': None,
|
|
||||||
'reason_for_applying': None,
|
|
||||||
'remark': None,
|
|
||||||
'status': '0',
|
|
||||||
'sf_functional_tool_assembly_id': None,
|
|
||||||
})
|
})
|
||||||
|
|
||||||
def revocation_2(self):
|
def revocation_2(self):
|
||||||
@@ -590,9 +613,7 @@ class MachineTableToolChangingApply(models.Model):
|
|||||||
:return:
|
:return:
|
||||||
"""
|
"""
|
||||||
self.env['sf.machine.table.tool.changing.apply'].search(
|
self.env['sf.machine.table.tool.changing.apply'].search(
|
||||||
[('name', '=', self.name.id)]).write({
|
[('name', '=', self.name.id)]).write({'status': '0'})
|
||||||
'status': '0'
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
class CAMWorkOrderProgramKnifePlan(models.Model):
|
class CAMWorkOrderProgramKnifePlan(models.Model):
|
||||||
@@ -688,7 +709,12 @@ class FunctionalToolAssembly(models.Model):
|
|||||||
_description = '功能刀具组装单'
|
_description = '功能刀具组装单'
|
||||||
_order = 'use_tool_time asc'
|
_order = 'use_tool_time asc'
|
||||||
|
|
||||||
name = fields.Char(string='名称', readonly=True)
|
@api.depends('functional_tool_name')
|
||||||
|
def _compute_name(self):
|
||||||
|
for obj in self:
|
||||||
|
obj.name = obj.functional_tool_name
|
||||||
|
|
||||||
|
name = fields.Char(string='名称', readonly=True, compute='_compute_name')
|
||||||
assembly_order_code = fields.Char(string='编码', readonly=True)
|
assembly_order_code = fields.Char(string='编码', readonly=True)
|
||||||
|
|
||||||
functional_tool_name_id = fields.Many2one('product.product', string='功能刀具', readonly=True)
|
functional_tool_name_id = fields.Many2one('product.product', string='功能刀具', readonly=True)
|
||||||
@@ -705,13 +731,13 @@ class FunctionalToolAssembly(models.Model):
|
|||||||
loading_task_source = fields.Selection([('0', 'CAM装刀'), ('1', '机台换刀'), ('2', '按库存组装')],
|
loading_task_source = fields.Selection([('0', 'CAM装刀'), ('1', '机台换刀'), ('2', '按库存组装')],
|
||||||
string='装刀任务来源', readonly=True)
|
string='装刀任务来源', readonly=True)
|
||||||
use_tool_time = fields.Datetime(string='用刀时间', readonly=True)
|
use_tool_time = fields.Datetime(string='用刀时间', readonly=True)
|
||||||
production_line_name_id = fields.Many2one('sf.production.line', string='申请产线', readonly=False)
|
production_line_name_id = fields.Many2one('sf.production.line', string='申请产线', readonly=True)
|
||||||
machine_tool_name_id = fields.Many2one('maintenance.equipment', string='申请机台', readonly=True)
|
machine_tool_name_id = fields.Many2one('maintenance.equipment', string='申请机台', readonly=True)
|
||||||
machine_tool_code = fields.Char(string='机台号', readonly=True)
|
machine_tool_code = fields.Char(string='机台号', readonly=True)
|
||||||
applicant = fields.Char(string='申请人', readonly=True)
|
applicant = fields.Char(string='申请人', readonly=True)
|
||||||
apply_time = fields.Datetime(string='申请时间', default=fields.Datetime.now(), readonly=True)
|
apply_time = fields.Datetime(string='申请时间', default=fields.Datetime.now(), readonly=True)
|
||||||
assemble_status = fields.Selection([('0', '待组装'), ('1', '已组装')], string='组装状态',
|
assemble_status = fields.Selection([('0', '待组装'), ('1', '已组装')], string='组装状态', default='0',
|
||||||
default='0', readonly=True)
|
readonly=True)
|
||||||
cutter_spacing_code_id = fields.Many2one('maintenance.equipment.tool', string='刀位号', readonly=True)
|
cutter_spacing_code_id = fields.Many2one('maintenance.equipment.tool', string='刀位号', readonly=True)
|
||||||
whether_standard_knife = fields.Boolean(string='是否标准刀', default=True, readonly=True)
|
whether_standard_knife = fields.Boolean(string='是否标准刀', default=True, readonly=True)
|
||||||
reason_for_applying = fields.Char(string='申请原因', readonly=True)
|
reason_for_applying = fields.Char(string='申请原因', readonly=True)
|
||||||
@@ -819,33 +845,29 @@ class FunctionalToolAssembly(models.Model):
|
|||||||
barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True)
|
barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True)
|
||||||
after_assembly_functional_tool_name = fields.Char(string='组装后功能刀具名称', readonly=True)
|
after_assembly_functional_tool_name = fields.Char(string='组装后功能刀具名称', readonly=True)
|
||||||
after_assembly_functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model',
|
after_assembly_functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model',
|
||||||
string='组装后功能刀具类型', readonly=True,
|
string='组装后功能刀具类型', readonly=True)
|
||||||
group_expand='_read_group_functional_tool_type_ids')
|
after_assembly_functional_tool_diameter = fields.Integer(string='组装后功能刀具直径(mm)', readonly=True)
|
||||||
after_assembly_functional_tool_diameter = fields.Integer(string='功能刀具直径(mm)', readonly=True)
|
after_assembly_knife_tip_r_angle = fields.Float(string='组装后刀尖R角(mm)', readonly=True)
|
||||||
after_assembly_knife_tip_r_angle = fields.Float(string='刀尖R角(mm)', readonly=True)
|
after_assembly_new_former = fields.Selection([('0', '新'), ('1', '旧')], string='组装后新/旧', readonly=True)
|
||||||
after_assembly_new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧', readonly=True)
|
cut_time = fields.Integer(string='已切削时间(min)', readonly=True)
|
||||||
cut_time = fields.Char(string='已切削时间', readonly=True)
|
cut_length = fields.Float(string='已切削长度(mm)', readonly=True)
|
||||||
cut_length = fields.Char(string='已切削长度(mm)', readonly=True)
|
cut_number = fields.Integer(string='已切削次数', readonly=True)
|
||||||
cut_number = fields.Char(string='已切削次数', readonly=True)
|
|
||||||
|
|
||||||
after_assembly_whether_standard_knife = fields.Boolean(string='是否标准刀', default=True, readonly=True)
|
after_assembly_whether_standard_knife = fields.Boolean(string='组装后是否标准刀', default=True, readonly=True)
|
||||||
after_assembly_coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')],
|
after_assembly_coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')],
|
||||||
string='粗/中/精', readonly=True)
|
string='组装后粗/中/精', readonly=True)
|
||||||
after_assembly_max_lifetime_value = fields.Integer(string='最大寿命值(min)', readonly=True)
|
after_assembly_max_lifetime_value = fields.Integer(string='组装后最大寿命值(min)', readonly=True)
|
||||||
after_assembly_alarm_value = fields.Integer(string='报警值(min)', readonly=True)
|
after_assembly_alarm_value = fields.Integer(string='组装后报警值(min)', readonly=True)
|
||||||
after_assembly_used_value = fields.Integer(string='已使用值(min)', readonly=True)
|
after_assembly_used_value = fields.Integer(string='组装后已使用值(min)', readonly=True)
|
||||||
after_assembly_tool_loading_length = fields.Float(string='装刀长(mm)', readonly=True)
|
after_assembly_tool_loading_length = fields.Float(string='组装后装刀长(mm)', readonly=True)
|
||||||
after_assembly_functional_tool_length = fields.Float(string='伸出长(mm)', readonly=True)
|
after_assembly_functional_tool_length = fields.Float(string='组装后伸出长(mm)', readonly=True)
|
||||||
after_assembly_effective_length = fields.Float(string='有效长(mm)', readonly=True)
|
after_assembly_effective_length = fields.Float(string='组装后有效长(mm)', readonly=True)
|
||||||
L_D_number = fields.Float(string='L/D值(mm)', readonly=True)
|
L_D_number = fields.Float(string='L/D值(mm)', readonly=True)
|
||||||
hiding_length = fields.Float(string='避空长(mm)', readonly=True)
|
hiding_length = fields.Float(string='避空长(mm)', readonly=True)
|
||||||
|
|
||||||
functional_tool_cutting_type = fields.Char(string='功能刀具切削类型', readonly=False)
|
functional_tool_cutting_type = fields.Char(string='功能刀具切削类型', readonly=False)
|
||||||
# cutter_spacing_code = fields.Char(string='刀位号', readonly=True)
|
|
||||||
tool_loading_person = fields.Char(string='装刀人', readonly=True)
|
tool_loading_person = fields.Char(string='装刀人', readonly=True)
|
||||||
tool_loading_time = fields.Datetime(string='装刀时间', readonly=True)
|
tool_loading_time = fields.Datetime(string='装刀时间', readonly=True)
|
||||||
receive_person = fields.Char(string='领用人', readonly=True)
|
|
||||||
receive_time = fields.Datetime(string='领用出库时间', readonly=True)
|
|
||||||
remark = fields.Char(string='备注说明', readonly=True)
|
remark = fields.Char(string='备注说明', readonly=True)
|
||||||
|
|
||||||
check_box_1 = fields.Boolean(string='复选框', default=False, readonly=False)
|
check_box_1 = fields.Boolean(string='复选框', default=False, readonly=False)
|
||||||
@@ -902,5 +924,4 @@ class FunctionalToolAssembly(models.Model):
|
|||||||
if obj.loading_task_source:
|
if obj.loading_task_source:
|
||||||
code = self._get_code(obj.loading_task_source)
|
code = self._get_code(obj.loading_task_source)
|
||||||
obj.assembly_order_code = code
|
obj.assembly_order_code = code
|
||||||
obj.name = code
|
|
||||||
return obj
|
return obj
|
||||||
|
|||||||
@@ -765,7 +765,6 @@
|
|||||||
'default_replacement_knife_tip_r_angle': knife_tip_r_angle,
|
'default_replacement_knife_tip_r_angle': knife_tip_r_angle,
|
||||||
'default_replacement_max_lifetime_value': max_lifetime_value,
|
'default_replacement_max_lifetime_value': max_lifetime_value,
|
||||||
'default_replacement_alarm_value': alarm_value,
|
'default_replacement_alarm_value': alarm_value,
|
||||||
'default_replacement_used_value': used_value,
|
|
||||||
'default_replacement_whether_standard_knife': whether_standard_knife,
|
'default_replacement_whether_standard_knife': whether_standard_knife,
|
||||||
'default_replacement_extension_length': extension_length,
|
'default_replacement_extension_length': extension_length,
|
||||||
'default_replacement_effective_length': effective_length,
|
'default_replacement_effective_length': effective_length,
|
||||||
@@ -842,7 +841,6 @@
|
|||||||
'default_replacement_knife_tip_r_angle': knife_tip_r_angle,
|
'default_replacement_knife_tip_r_angle': knife_tip_r_angle,
|
||||||
'default_replacement_max_lifetime_value': max_lifetime_value,
|
'default_replacement_max_lifetime_value': max_lifetime_value,
|
||||||
'default_replacement_alarm_value': alarm_value,
|
'default_replacement_alarm_value': alarm_value,
|
||||||
'default_replacement_used_value': used_value,
|
|
||||||
'default_replacement_whether_standard_knife': whether_standard_knife,
|
'default_replacement_whether_standard_knife': whether_standard_knife,
|
||||||
'default_replacement_extension_length': extension_length,
|
'default_replacement_extension_length': extension_length,
|
||||||
'default_replacement_effective_length': effective_length,
|
'default_replacement_effective_length': effective_length,
|
||||||
@@ -880,6 +878,7 @@
|
|||||||
<button string="撤回转移" name="revocation_2" type="object" class="btn-primary"
|
<button string="撤回转移" name="revocation_2" type="object" class="btn-primary"
|
||||||
attrs="{'invisible': [('status', '!=', '2')]}" confirm="是否确认撤回转移"/>
|
attrs="{'invisible': [('status', '!=', '2')]}" confirm="是否确认撤回转移"/>
|
||||||
</header>
|
</header>
|
||||||
|
<field name="functional_tool_status" string="状态" invisible="True"/>
|
||||||
<sheet>
|
<sheet>
|
||||||
<div class="oe_title">
|
<div class="oe_title">
|
||||||
<h1>
|
<h1>
|
||||||
@@ -962,7 +961,7 @@
|
|||||||
</record>
|
</record>
|
||||||
|
|
||||||
|
|
||||||
<!--================================================CAM工单程序用刀计划================================================-->
|
<!--===============================================CAM工单程序用刀计划=========================================-->
|
||||||
<record id="sf_CAM_work_order_program_knife_plan_tree" model="ir.ui.view">
|
<record id="sf_CAM_work_order_program_knife_plan_tree" model="ir.ui.view">
|
||||||
<field name="name">CAM工单程序用刀计划</field>
|
<field name="name">CAM工单程序用刀计划</field>
|
||||||
<field name="model">sf.cam.work.order.program.knife.plan</field>
|
<field name="model">sf.cam.work.order.program.knife.plan</field>
|
||||||
@@ -1103,27 +1102,35 @@
|
|||||||
<field name="apply_time"/>
|
<field name="apply_time"/>
|
||||||
<field name="assemble_status" optional="hide"/>
|
<field name="assemble_status" optional="hide"/>
|
||||||
|
|
||||||
|
<field name="name" invisible="True"/>
|
||||||
<field name="machine_tool_code" invisible="True"/>
|
<field name="machine_tool_code" invisible="True"/>
|
||||||
<field name="cutter_spacing_code_id" invisible="True"/>
|
<field name="cutter_spacing_code_id" invisible="True"/>
|
||||||
<field name="whether_standard_knife" invisible="True"/>
|
<field name="whether_standard_knife" invisible="True"/>
|
||||||
<field name="reason_for_applying" invisible="True"/>
|
<field name="reason_for_applying" invisible="True"/>
|
||||||
|
|
||||||
<field name="receive_person" invisible="True"/>
|
|
||||||
<field name="receive_time" invisible="True"/>
|
|
||||||
<field name="remark" invisible="True"/>
|
|
||||||
<field name="functional_tool_name_id" invisible="True"/>
|
|
||||||
<field name="functional_tool_type_id" invisible="True"/>
|
<field name="functional_tool_type_id" invisible="True"/>
|
||||||
<field name="machine_tool_name_id" invisible="True"/>
|
|
||||||
<field name="machine_tool_code" invisible="True"/>
|
|
||||||
<field name="cutter_spacing_code_id" invisible="True"/>
|
|
||||||
<field name="functional_tool_length" invisible="True"/>
|
|
||||||
<field name="functional_tool_diameter" invisible="True"/>
|
|
||||||
<field name="functional_tool_cutting_type" invisible="True"/>
|
<field name="functional_tool_cutting_type" invisible="True"/>
|
||||||
|
|
||||||
<button string="组装"
|
<button string="组装"
|
||||||
name="%(sf_tool_management.sf_functional_tool_assembly_order_act)d"
|
name="%(sf_tool_management.sf_functional_tool_assembly_order_act)d"
|
||||||
type="action"
|
type="action"
|
||||||
context="{}"
|
context="{'default_name':name,
|
||||||
|
'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,
|
||||||
|
'default_functional_tool_name':functional_tool_name,
|
||||||
|
'default_functional_tool_type_id':functional_tool_type_id,
|
||||||
|
'default_functional_tool_diameter':functional_tool_diameter,
|
||||||
|
'default_knife_tip_r_angle':knife_tip_r_angle,
|
||||||
|
'default_tool_loading_length':tool_loading_length,
|
||||||
|
'default_functional_tool_length':functional_tool_length,
|
||||||
|
'default_effective_length':effective_length,
|
||||||
|
'default_whether_standard_knife':whether_standard_knife,
|
||||||
|
'default_coarse_middle_thin':coarse_middle_thin,
|
||||||
|
'default_new_former':new_former,
|
||||||
|
'default_use_tool_time':use_tool_time,
|
||||||
|
'default_reason_for_applying':reason_for_applying,
|
||||||
|
'default_functional_tool_cutting_type':functional_tool_cutting_type,
|
||||||
|
}"
|
||||||
attrs="{'invisible': [('assemble_status', '!=', '0')]}"
|
attrs="{'invisible': [('assemble_status', '!=', '0')]}"
|
||||||
class="btn-primary"/>
|
class="btn-primary"/>
|
||||||
<button string="组装单打印" name="assemble_single_print" type="object"
|
<button string="组装单打印" name="assemble_single_print" type="object"
|
||||||
@@ -1142,7 +1149,24 @@
|
|||||||
<button string="组装"
|
<button string="组装"
|
||||||
name="%(sf_tool_management.sf_functional_tool_assembly_order_act)d"
|
name="%(sf_tool_management.sf_functional_tool_assembly_order_act)d"
|
||||||
type="action"
|
type="action"
|
||||||
context="{}"
|
context="{'default_name':name,
|
||||||
|
'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,
|
||||||
|
'default_functional_tool_name':functional_tool_name,
|
||||||
|
'default_functional_tool_type_id':functional_tool_type_id,
|
||||||
|
'default_functional_tool_diameter':functional_tool_diameter,
|
||||||
|
'default_knife_tip_r_angle':knife_tip_r_angle,
|
||||||
|
'default_tool_loading_length':tool_loading_length,
|
||||||
|
'default_functional_tool_length':functional_tool_length,
|
||||||
|
'default_effective_length':effective_length,
|
||||||
|
'default_whether_standard_knife':whether_standard_knife,
|
||||||
|
'default_coarse_middle_thin':coarse_middle_thin,
|
||||||
|
'default_new_former':new_former,
|
||||||
|
'default_use_tool_time':use_tool_time,
|
||||||
|
'default_reason_for_applying':reason_for_applying,
|
||||||
|
'default_functional_tool_cutting_type':functional_tool_cutting_type,
|
||||||
|
}"
|
||||||
attrs="{'invisible': [('assemble_status', '!=', '0')]}"
|
attrs="{'invisible': [('assemble_status', '!=', '0')]}"
|
||||||
class="btn-primary"/>
|
class="btn-primary"/>
|
||||||
|
|
||||||
@@ -1160,6 +1184,7 @@
|
|||||||
<field name="assembly_order_code"/>
|
<field name="assembly_order_code"/>
|
||||||
</h1>
|
</h1>
|
||||||
</div>
|
</div>
|
||||||
|
<field name="name" invisible="1"/>
|
||||||
<group>
|
<group>
|
||||||
<group>
|
<group>
|
||||||
<field name="production_line_name_id"/>
|
<field name="production_line_name_id"/>
|
||||||
@@ -1177,16 +1202,34 @@
|
|||||||
<group col="1">
|
<group col="1">
|
||||||
<group>
|
<group>
|
||||||
<group>
|
<group>
|
||||||
<field name="coarse_middle_thin"/>
|
<field name="barcode_id"/>
|
||||||
<field name="new_former"/>
|
<field name="after_assembly_functional_tool_name"
|
||||||
<field name="tool_loading_length"/>
|
string="功能刀具名称"/>
|
||||||
<field name="reference_length"/>
|
<field name="after_assembly_functional_tool_type_id"
|
||||||
</group>
|
string="功能刀具类型"/>
|
||||||
<group>
|
<field name="after_assembly_functional_tool_diameter"
|
||||||
|
string="刀具直径(mm)"/>
|
||||||
|
<field name="after_assembly_knife_tip_r_angle" string="刀尖R角(mm)"/>
|
||||||
|
<field name="after_assembly_new_former" string="新/旧"/>
|
||||||
<field name="cut_time"/>
|
<field name="cut_time"/>
|
||||||
<field name="cut_length"/>
|
<field name="cut_length"/>
|
||||||
<field name="cut_number"/>
|
<field name="cut_number"/>
|
||||||
</group>
|
</group>
|
||||||
|
<group>
|
||||||
|
<field name="after_assembly_whether_standard_knife"
|
||||||
|
string="是否标准刀"/>
|
||||||
|
<field name="after_assembly_coarse_middle_thin" string="粗/中/精"/>
|
||||||
|
<field name="after_assembly_max_lifetime_value"
|
||||||
|
string="最大寿命值(min)"/>
|
||||||
|
<field name="after_assembly_alarm_value" string="报警值(min)"/>
|
||||||
|
<field name="after_assembly_used_value" string="已使用值(min)"/>
|
||||||
|
<field name="after_assembly_tool_loading_length" string="装刀长(mm)"/>
|
||||||
|
<field name="after_assembly_functional_tool_length"
|
||||||
|
string="伸出长(mm)"/>
|
||||||
|
<field name="after_assembly_effective_length" string="有效长(mm)"/>
|
||||||
|
<field name="L_D_number"/>
|
||||||
|
<field name="hiding_length"/>
|
||||||
|
</group>
|
||||||
</group>
|
</group>
|
||||||
</group>
|
</group>
|
||||||
</group>
|
</group>
|
||||||
@@ -1291,7 +1334,8 @@
|
|||||||
<field name="coarse_middle_thin"/>
|
<field name="coarse_middle_thin"/>
|
||||||
<field name="new_former"/>
|
<field name="new_former"/>
|
||||||
<field name="use_tool_time"/>
|
<field name="use_tool_time"/>
|
||||||
<field name="reason_for_applying"/>、
|
<field name="reason_for_applying"/>
|
||||||
|
<field name="functional_tool_cutting_type"/>
|
||||||
</group>
|
</group>
|
||||||
</group>
|
</group>
|
||||||
</page>
|
</page>
|
||||||
@@ -1299,11 +1343,9 @@
|
|||||||
<group>
|
<group>
|
||||||
<group>
|
<group>
|
||||||
<field name="tool_loading_person"/>
|
<field name="tool_loading_person"/>
|
||||||
<field name="receive_person"/>
|
|
||||||
</group>
|
</group>
|
||||||
<group>
|
<group>
|
||||||
<field name="tool_loading_time"/>
|
<field name="tool_loading_time"/>
|
||||||
<field name="receive_time"/>
|
|
||||||
</group>
|
</group>
|
||||||
</group>
|
</group>
|
||||||
</page>
|
</page>
|
||||||
|
|||||||
@@ -32,21 +32,21 @@ class ToolChangeRequirementInformation(models.TransientModel):
|
|||||||
effective_length = fields.Float(string='有效长(mm)', readonly=True)
|
effective_length = fields.Float(string='有效长(mm)', readonly=True)
|
||||||
|
|
||||||
# 待换功能刀具信息
|
# 待换功能刀具信息
|
||||||
replacement_tool_name = fields.Char(string='待换功能刀具名称')
|
replacement_tool_name = fields.Char(string='待换功能刀具名称', required=True)
|
||||||
replacement_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='待换功能刀具类型')
|
replacement_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='待换功能刀具类型')
|
||||||
replacement_diameter = fields.Integer(string='待换刀具直径(mm)', requried=True)
|
replacement_diameter = fields.Integer(string='待换刀具直径(mm)')
|
||||||
replacement_knife_tip_r_angle = fields.Float(string='待换刀具刀尖R角(mm)', requried=True)
|
replacement_knife_tip_r_angle = fields.Float(string='待换刀具刀尖R角(mm)')
|
||||||
replacement_tool_setting_length = fields.Float(string='待换刀具装刀长(mm)', requried=True)
|
replacement_tool_setting_length = fields.Float(string='待换刀具装刀长(mm)')
|
||||||
replacement_extension_length = fields.Float(string='待换刀具伸出长(mm)', requried=True)
|
replacement_extension_length = fields.Float(string='待换刀具伸出长(mm)')
|
||||||
replacement_effective_length = fields.Float(string='待换刀具有效长(mm)', requried=True)
|
replacement_effective_length = fields.Float(string='待换刀具有效长(mm)')
|
||||||
replacement_tool_coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')],
|
replacement_tool_coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')],
|
||||||
string='待换刀具粗/中/精', default='3')
|
string='待换刀具粗/中/精', default='3')
|
||||||
|
|
||||||
replacement_max_lifetime_value = fields.Integer(string='待换刀具最大寿命值(min)', requried=True)
|
replacement_max_lifetime_value = fields.Integer(string='待换刀具最大寿命值(min)')
|
||||||
replacement_alarm_value = fields.Integer(string='待换刀具报警值(min)', requried=True)
|
replacement_alarm_value = fields.Integer(string='待换刀具报警值(min)')
|
||||||
replacement_used_value = fields.Integer(string='待换刀具已使用值(min)', requried=True)
|
replacement_used_value = fields.Integer(string='待换刀具已使用值(min)')
|
||||||
new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧', default='0')
|
new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧', default='0')
|
||||||
replacement_whether_standard_knife = fields.Boolean(string='待换刀具是否标准刀', default=True, requried=True)
|
replacement_whether_standard_knife = fields.Boolean(string='待换刀具是否标准刀', default=True)
|
||||||
used_tool_time = fields.Datetime(string='用刀时间',
|
used_tool_time = fields.Datetime(string='用刀时间',
|
||||||
default=lambda self: fields.Datetime.now() + timedelta(hours=4))
|
default=lambda self: fields.Datetime.now() + timedelta(hours=4))
|
||||||
applicant = fields.Char(string='申请人', default=lambda self: self.env.user.name, readonly=True)
|
applicant = fields.Char(string='申请人', default=lambda self: self.env.user.name, readonly=True)
|
||||||
@@ -83,7 +83,8 @@ class ToolChangeRequirementInformation(models.TransientModel):
|
|||||||
'apply_time': fields.Datetime.now(),
|
'apply_time': fields.Datetime.now(),
|
||||||
'cutter_spacing_code_id': self.cutter_spacing_code_id.id,
|
'cutter_spacing_code_id': self.cutter_spacing_code_id.id,
|
||||||
'whether_standard_knife': self.whether_standard_knife,
|
'whether_standard_knife': self.whether_standard_knife,
|
||||||
'reason_for_applying': self.reason_for_applying
|
'reason_for_applying': self.reason_for_applying,
|
||||||
|
'sf_machine_table_tool_changing_apply_id': record.id
|
||||||
})
|
})
|
||||||
print('sf_functional_tool_assembly:', sf_functional_tool_assembly)
|
print('sf_functional_tool_assembly:', sf_functional_tool_assembly)
|
||||||
# 修改机床换刀申请状态
|
# 修改机床换刀申请状态
|
||||||
@@ -129,7 +130,7 @@ class ToolTransferRequestInformation(models.TransientModel):
|
|||||||
('线边刀库', '线边刀库'),
|
('线边刀库', '线边刀库'),
|
||||||
('刀具房', '刀具房')], string='转移到:', default='线边刀库')
|
('刀具房', '刀具房')], string='转移到:', default='线边刀库')
|
||||||
new_cnc_machine_table_id = fields.Many2one('sf.machine_tool', string='机床名称')
|
new_cnc_machine_table_id = fields.Many2one('sf.machine_tool', string='机床名称')
|
||||||
new_production_line_id = fields.Many2one('sf.production.line', string='生产线')
|
new_production_line_id = fields.Many2one('sf.production.line', string='目标生产线')
|
||||||
new_machine_tool_code = fields.Char(string='机床号')
|
new_machine_tool_code = fields.Char(string='机床号')
|
||||||
new_cutter_spacing_code = fields.Char(string='目标刀位号')
|
new_cutter_spacing_code = fields.Char(string='目标刀位号')
|
||||||
|
|
||||||
@@ -153,21 +154,33 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
|
|||||||
_inherit = ["barcodes.barcode_events_mixin"]
|
_inherit = ["barcodes.barcode_events_mixin"]
|
||||||
_description = '功能刀具组装单'
|
_description = '功能刀具组装单'
|
||||||
|
|
||||||
# 功能刀具申请信息
|
functional_tool_name_id = fields.Many2one('product.product', string='功能刀具', readonly=True)
|
||||||
machine_tool_name_id = fields.Many2one('maintenance.equipment', 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,
|
||||||
|
group_expand='_read_group_functional_tool_type_ids')
|
||||||
|
functional_tool_diameter = fields.Integer(string='功能刀具直径(mm)', readonly=True)
|
||||||
|
knife_tip_r_angle = fields.Float(string='刀尖R角(mm)', readonly=True)
|
||||||
|
coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=True)
|
||||||
|
new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧', readonly=True)
|
||||||
|
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)
|
||||||
|
loading_task_source = fields.Selection([('0', 'CAM装刀'), ('1', '机台换刀'), ('2', '按库存组装')],
|
||||||
|
string='装刀任务来源', readonly=True)
|
||||||
|
use_tool_time = fields.Datetime(string='用刀时间', readonly=True)
|
||||||
|
production_line_name_id = fields.Many2one('sf.production.line', string='申请产线', readonly=True)
|
||||||
|
machine_tool_name_id = fields.Many2one('maintenance.equipment', string='申请机台', readonly=True)
|
||||||
machine_tool_code = fields.Char(string='机台号', readonly=True)
|
machine_tool_code = fields.Char(string='机台号', readonly=True)
|
||||||
cutter_spacing_code = fields.Char(string='刀位号', readonly=True)
|
applicant = fields.Char(string='申请人', readonly=True)
|
||||||
# code = fields.Char(string='功能刀具编码', readonly=True)
|
apply_time = fields.Datetime(string='申请时间', default=fields.Datetime.now(), readonly=True)
|
||||||
barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True)
|
assemble_status = fields.Selection([('0', '待组装'), ('1', '已组装')], string='组装状态', default='0',
|
||||||
functional_tool_name_id = fields.Many2one('product.product', string='功能刀具名称', readonly=True)
|
readonly=True)
|
||||||
functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True)
|
cutter_spacing_code_id = fields.Many2one('maintenance.equipment.tool', string='刀位号', readonly=True)
|
||||||
functional_tool_length = fields.Char(string='功能刀具伸出长(mm)', readonly=True)
|
whether_standard_knife = fields.Boolean(string='是否标准刀', default=True, readonly=True)
|
||||||
effective_length = fields.Char(string='有效长(mm)', readonly=True)
|
reason_for_applying = fields.Char(string='申请原因', readonly=True)
|
||||||
functional_tool_diameter = fields.Char(string='功能刀具直径(mm)', readonly=True)
|
max_lifetime_value = fields.Integer(string='最大寿命值(min)', readonly=True)
|
||||||
tool_included_angle = fields.Char(string='刀尖角(R角)', readonly=True)
|
alarm_value = fields.Integer(string='报警值(min)', readonly=True)
|
||||||
functional_tool_cutting_type = fields.Char(string='功能刀具切削类型', readonly=True)
|
used_value = fields.Integer(string='已使用值(min)', readonly=True)
|
||||||
required_cutting_time = fields.Char(string='需切削时长', readonly=True)
|
|
||||||
whether_standard_tool = fields.Boolean(string='是否标准刀', readonly=True)
|
|
||||||
|
|
||||||
# 功能刀具组装信息
|
# 功能刀具组装信息
|
||||||
# 整体式刀具型号
|
# 整体式刀具型号
|
||||||
@@ -294,13 +307,30 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
|
|||||||
record.chuck_name = None
|
record.chuck_name = None
|
||||||
record.sf_tool_brand_id_6 = None
|
record.sf_tool_brand_id_6 = None
|
||||||
|
|
||||||
coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', default='1')
|
# 组装功能刀具参数信息
|
||||||
tool_loading_length = fields.Char(string='装刀长')
|
barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号')
|
||||||
new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧', required=True, default='0')
|
after_assembly_functional_tool_name = fields.Char(string='组装后功能刀具名称', required=True)
|
||||||
reference_length = fields.Char(string='参考伸出长')
|
after_assembly_functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model',
|
||||||
cut_time = fields.Char(string='已切削时间')
|
string='组装后功能刀具类型')
|
||||||
cut_length = fields.Char(string='已切削长度')
|
after_assembly_functional_tool_diameter = fields.Integer(string='组装后功能刀具直径(mm)')
|
||||||
cut_number = fields.Char(string='已切削次数')
|
after_assembly_knife_tip_r_angle = fields.Float(string='组装后刀尖R角(mm)')
|
||||||
|
after_assembly_new_former = fields.Selection([('0', '新'), ('1', '旧')], string='组装后新/旧')
|
||||||
|
cut_time = fields.Integer(string='已切削时间(min)')
|
||||||
|
cut_length = fields.Float(string='已切削长度(mm)')
|
||||||
|
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_max_lifetime_value = fields.Integer(string='组装后最大寿命值(min)')
|
||||||
|
after_assembly_alarm_value = fields.Integer(string='组装后报警值(min)')
|
||||||
|
after_assembly_used_value = fields.Integer(string='组装后已使用值(min)')
|
||||||
|
after_assembly_tool_loading_length = fields.Float(string='组装后装刀长(mm)')
|
||||||
|
after_assembly_functional_tool_length = fields.Float(string='组装后伸出长(mm)')
|
||||||
|
after_assembly_effective_length = fields.Float(string='组装后有效长(mm)')
|
||||||
|
L_D_number = fields.Float(string='L/D值(mm)')
|
||||||
|
hiding_length = fields.Float(string='避空长(mm)')
|
||||||
|
|
||||||
|
functional_tool_cutting_type = fields.Char(string='功能刀具切削类型', readonly=False)
|
||||||
|
|
||||||
def functional_tool_assembly(self):
|
def functional_tool_assembly(self):
|
||||||
"""
|
"""
|
||||||
@@ -319,26 +349,26 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
|
|||||||
desc_1 = self.get_desc_1(stock_lot)
|
desc_1 = self.get_desc_1(stock_lot)
|
||||||
functional_tool_assembly = self.env['sf.functional.tool.assembly'].search([
|
functional_tool_assembly = self.env['sf.functional.tool.assembly'].search([
|
||||||
('machine_tool_name_id', '=', self.machine_tool_name_id.id),
|
('machine_tool_name_id', '=', self.machine_tool_name_id.id),
|
||||||
('cutter_spacing_code', '=', self.cutter_spacing_code),
|
('cutter_spacing_code_id', '=', self.cutter_spacing_code_id.id),
|
||||||
('assemble_status', '=', '0'),
|
('assemble_status', '=', '0'),
|
||||||
])
|
])
|
||||||
|
|
||||||
# 创建功能刀具列表记录
|
# 创建功能刀具列表记录
|
||||||
# 封装功能刀具数据
|
# 封装功能刀具数据
|
||||||
desc_2 = self.get_desc_2(stock_lot)
|
# desc_2 = self.get_desc_2(stock_lot)
|
||||||
# 创建功能刀具列表、功能刀具预警、功能刀具实时分布、功能刀具出入库记录
|
# # 创建功能刀具列表、功能刀具预警、功能刀具实时分布、功能刀具出入库记录
|
||||||
record_1 = self.env['sf.functional.cutting.tool.entity'].create(desc_2)
|
# record_1 = self.env['sf.functional.cutting.tool.entity'].create(desc_2)
|
||||||
self.env['sf.functional.tool.warning'].create({
|
# self.env['sf.functional.tool.warning'].create({
|
||||||
'functional_cutting_tool_id': record_1.id,
|
# 'functional_cutting_tool_id': record_1.id,
|
||||||
'functional_tool_assembly_id': functional_tool_assembly.id,
|
# 'functional_tool_assembly_id': functional_tool_assembly.id,
|
||||||
'machine_table_name_id': self.machine_tool_name_id.id,
|
# 'machine_table_name_id': self.machine_tool_name_id.id,
|
||||||
})
|
# })
|
||||||
self.env['sf.real.time.distribution.of.functional.tools'].create({
|
# self.env['sf.real.time.distribution.of.functional.tools'].create({
|
||||||
'functional_cutting_tool_id': record_1.id
|
# 'functional_cutting_tool_id': record_1.id
|
||||||
})
|
# })
|
||||||
self.env['sf.inbound.and.outbound.records.of.functional.tools'].create({
|
# self.env['sf.inbound.and.outbound.records.of.functional.tools'].create({
|
||||||
'functional_cutting_tool_id': record_1.id
|
# 'functional_cutting_tool_id': record_1.id
|
||||||
})
|
# })
|
||||||
|
|
||||||
# 修改功能刀具组装单信息
|
# 修改功能刀具组装单信息
|
||||||
functional_tool_assembly.write(desc_1)
|
functional_tool_assembly.write(desc_1)
|
||||||
@@ -458,13 +488,25 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
|
|||||||
'pad_code_id': self.pad_code_id.id,
|
'pad_code_id': self.pad_code_id.id,
|
||||||
'handle_code_id': self.handle_code_id.id,
|
'handle_code_id': self.handle_code_id.id,
|
||||||
'chuck_code_id': self.chuck_code_id.id,
|
'chuck_code_id': self.chuck_code_id.id,
|
||||||
'coarse_middle_thin': self.coarse_middle_thin,
|
|
||||||
'tool_loading_length': self.tool_loading_length,
|
'after_assembly_functional_tool_name': self.after_assembly_functional_tool_name,
|
||||||
'new_former': self.new_former,
|
'after_assembly_functional_tool_type_id': self.after_assembly_functional_tool_type_id.id,
|
||||||
'reference_length': self.reference_length,
|
'after_assembly_functional_tool_diameter': self.after_assembly_functional_tool_diameter,
|
||||||
|
'after_assembly_knife_tip_r_angle': self.after_assembly_knife_tip_r_angle,
|
||||||
|
'after_assembly_new_former': self.after_assembly_new_former,
|
||||||
'cut_time': self.cut_time,
|
'cut_time': self.cut_time,
|
||||||
'cut_length': self.cut_length,
|
'cut_length': self.cut_length,
|
||||||
'cut_number': self.cut_number,
|
'cut_number': self.cut_number,
|
||||||
|
'after_assembly_whether_standard_knife': self.after_assembly_whether_standard_knife,
|
||||||
|
'after_assembly_coarse_middle_thin': self.after_assembly_coarse_middle_thin,
|
||||||
|
'after_assembly_max_lifetime_value': self.after_assembly_max_lifetime_value,
|
||||||
|
'after_assembly_alarm_value': self.after_assembly_alarm_value,
|
||||||
|
'after_assembly_used_value': self.after_assembly_used_value,
|
||||||
|
'after_assembly_tool_loading_length': self.after_assembly_tool_loading_length,
|
||||||
|
'after_assembly_functional_tool_length': self.after_assembly_functional_tool_length,
|
||||||
|
'after_assembly_effective_length': self.after_assembly_effective_length,
|
||||||
|
'L_D_number': self.L_D_number,
|
||||||
|
'hiding_length': self.hiding_length,
|
||||||
'assemble_status': '1',
|
'assemble_status': '1',
|
||||||
'tool_loading_person': self.env.user.name,
|
'tool_loading_person': self.env.user.name,
|
||||||
'tool_loading_time': fields.Datetime.now()
|
'tool_loading_time': fields.Datetime.now()
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
<?xml version="1.0" encoding="UTF-8" ?>
|
||||||
<odoo>
|
<odoo>
|
||||||
<!--================================================换刀需求信息================================================-->
|
<!--================================================换刀需求信息================================================-->
|
||||||
<record id="sf_tool_change_requirement_information_form" model="ir.ui.view">
|
<record id="sf_tool_change_requirement_information_form" model="ir.ui.view">
|
||||||
<field name="name">换刀需求信息</field>
|
<field name="name">换刀需求信息</field>
|
||||||
<field name="model">sf.tool.change.requirement.information</field>
|
<field name="model">sf.tool.change.requirement.information</field>
|
||||||
@@ -20,7 +20,7 @@
|
|||||||
<field name="tool_position_interface_type"/>
|
<field name="tool_position_interface_type"/>
|
||||||
<field name="max_lifetime_value"/>
|
<field name="max_lifetime_value"/>
|
||||||
<field name="alarm_value"/>
|
<field name="alarm_value"/>
|
||||||
<field name="alarm_value"/>
|
<field name="used_value"/>
|
||||||
<field name="whether_standard_knife"/>
|
<field name="whether_standard_knife"/>
|
||||||
</group>
|
</group>
|
||||||
<group>
|
<group>
|
||||||
@@ -57,7 +57,8 @@
|
|||||||
</group>
|
</group>
|
||||||
</sheet>
|
</sheet>
|
||||||
<footer>
|
<footer>
|
||||||
<button string="确定" name="tool_changing_apply" type="object" class="btn-primary" confirm="是否确认申请换刀"/>
|
<button string="确定" name="tool_changing_apply" type="object" class="btn-primary"
|
||||||
|
confirm="是否确认申请换刀"/>
|
||||||
<button string="取消" class="btn-secondary" special="cancel"/>
|
<button string="取消" class="btn-secondary" special="cancel"/>
|
||||||
</footer>
|
</footer>
|
||||||
</form>
|
</form>
|
||||||
@@ -74,7 +75,7 @@
|
|||||||
</record>
|
</record>
|
||||||
|
|
||||||
|
|
||||||
<!--================================================刀具转移申请信息================================================-->
|
<!--================================================刀具转移申请信息================================================-->
|
||||||
<record id="sf_tool_transfer_request_information_form" model="ir.ui.view">
|
<record id="sf_tool_transfer_request_information_form" model="ir.ui.view">
|
||||||
<field name="name">刀具转移申请信息</field>
|
<field name="name">刀具转移申请信息</field>
|
||||||
<field name="model">sf.tool.transfer.request.information</field>
|
<field name="model">sf.tool.transfer.request.information</field>
|
||||||
@@ -114,19 +115,27 @@
|
|||||||
</group>
|
</group>
|
||||||
<group>
|
<group>
|
||||||
<group>
|
<group>
|
||||||
<!-- <field name="new_cnc_machine_table_id" attrs="{'invisible': [('transfer_target', '!=', '机台')]}"/>-->
|
<!-- <field name="new_cnc_machine_table_id" attrs="{'invisible': [('transfer_target', '!=', '机台')]}"/>-->
|
||||||
<field name="new_production_line_id" attrs="{'invisible': [('transfer_target', '!=', '机台')]}"/>
|
<field name="new_production_line_id"
|
||||||
<field name="new_machine_tool_code" attrs="{'invisible': [('transfer_target', '!=', '机台')]}"/>
|
attrs="{'invisible': [('transfer_target', '!=', '机台')]}"/>
|
||||||
<field name="new_cutter_spacing_code" string="刀位号" attrs="{'invisible': [('transfer_target', '!=', '机台')]}"/>
|
<field name="new_machine_tool_code"
|
||||||
<field name="magazine_tool_warehouse_district" attrs="{'invisible': [('transfer_target', '!=', '线边刀库')]}"/>
|
attrs="{'invisible': [('transfer_target', '!=', '机台')]}"/>
|
||||||
<field name="magazine_tool_warehouse_position" attrs="{'invisible': [('transfer_target', '!=', '线边刀库')]}"/>
|
<field name="new_cutter_spacing_code" string="刀位号"
|
||||||
<field name="tool_room_warehouse_district" attrs="{'invisible': [('transfer_target', '!=', '刀具房')]}"/>
|
attrs="{'invisible': [('transfer_target', '!=', '机台')]}"/>
|
||||||
<field name="tool_room_warehouse_position" attrs="{'invisible': [('transfer_target', '!=', '刀具房')]}"/>
|
<field name="magazine_tool_warehouse_district"
|
||||||
|
attrs="{'invisible': [('transfer_target', '!=', '线边刀库')]}"/>
|
||||||
|
<field name="magazine_tool_warehouse_position"
|
||||||
|
attrs="{'invisible': [('transfer_target', '!=', '线边刀库')]}"/>
|
||||||
|
<field name="tool_room_warehouse_district"
|
||||||
|
attrs="{'invisible': [('transfer_target', '!=', '刀具房')]}"/>
|
||||||
|
<field name="tool_room_warehouse_position"
|
||||||
|
attrs="{'invisible': [('transfer_target', '!=', '刀具房')]}"/>
|
||||||
</group>
|
</group>
|
||||||
</group>
|
</group>
|
||||||
</sheet>
|
</sheet>
|
||||||
<footer>
|
<footer>
|
||||||
<button string="确定" name="tool_transfer_apply" type="object" class="btn-primary" confirm="是否确认刀具转移申请"/>
|
<button string="确定" name="tool_transfer_apply" type="object" class="btn-primary"
|
||||||
|
confirm="是否确认刀具转移申请"/>
|
||||||
<button string="取消" class="btn-secondary" special="cancel"/>
|
<button string="取消" class="btn-secondary" special="cancel"/>
|
||||||
</footer>
|
</footer>
|
||||||
</form>
|
</form>
|
||||||
@@ -143,34 +152,47 @@
|
|||||||
</record>
|
</record>
|
||||||
|
|
||||||
|
|
||||||
<!--================================================功能刀具组装单================================================-->
|
<!--================================================功能刀具组装单================================================-->
|
||||||
<record id="sf_functional_tool_assembly_order_form" model="ir.ui.view">
|
<record id="sf_functional_tool_assembly_order_form" model="ir.ui.view">
|
||||||
<field name="name">功能刀具组装单</field>
|
<field name="name">功能刀具组装单</field>
|
||||||
<field name="model">sf.functional.tool.assembly.order</field>
|
<field name="model">sf.functional.tool.assembly.order</field>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<form string="功能刀具组装单">
|
<form string="功能刀具组装单">
|
||||||
<sheet>
|
<sheet>
|
||||||
<group string="功能刀具申请信息">
|
<div class="oe_title">
|
||||||
|
<h1>
|
||||||
|
<field name="production_line_name_id"/>
|
||||||
|
</h1>
|
||||||
|
</div>
|
||||||
|
<group>
|
||||||
<group>
|
<group>
|
||||||
<field name="machine_tool_name_id"/>
|
<field name="machine_tool_name_id"/>
|
||||||
<field name="barcode_id"/>
|
<field name="cutter_spacing_code_id"/>
|
||||||
<field name="functional_tool_name_id"/>
|
</group>
|
||||||
|
</group>
|
||||||
|
<group string="功能刀具申请信息">
|
||||||
|
<group>
|
||||||
|
<field name="functional_tool_name"/>
|
||||||
|
<field name="functional_tool_type_id"/>
|
||||||
|
<field name="functional_tool_diameter" string="刀具直径(mm)"/>
|
||||||
|
<field name="knife_tip_r_angle"/>
|
||||||
|
<field name="tool_loading_length"/>
|
||||||
<field name="functional_tool_length"/>
|
<field name="functional_tool_length"/>
|
||||||
<field name="effective_length"/>
|
<field name="effective_length"/>
|
||||||
<field name="functional_tool_cutting_type"/>
|
|
||||||
</group>
|
</group>
|
||||||
<group>
|
<group>
|
||||||
<field name="cutter_spacing_code"/>
|
<field name="whether_standard_knife"/>
|
||||||
<field name="functional_tool_type_id"/>
|
<field name="coarse_middle_thin"/>
|
||||||
<field name="functional_tool_diameter"/>
|
<field name="new_former"/>
|
||||||
<field name="tool_included_angle"/>
|
<field name="use_tool_time"/>
|
||||||
<field name="whether_standard_tool"/>
|
<field name="reason_for_applying"/>
|
||||||
<field name="required_cutting_time"/>
|
<field name="functional_tool_cutting_type"/>
|
||||||
</group>
|
</group>
|
||||||
</group>
|
</group>
|
||||||
<group string="组装物料信息" col="1">
|
<group string="组装物料信息" col="1">
|
||||||
<field name="_barcode_scanned" widget="barcode_handler"/>
|
<field name="_barcode_scanned" widget="barcode_handler"/>
|
||||||
<group col="1" attrs="{'invisible': ['|','|',('blade_code_id', '!=', False),('bar_code_id', '!=', False),('pad_code_id', '!=', False)]}">
|
<group col="1"
|
||||||
|
attrs="{'invisible': ['|','|',('blade_code_id', '!=', False),('bar_code_id', '!=', False),('pad_code_id', '!=', False)]}">
|
||||||
<div>
|
<div>
|
||||||
<separator string="整体式刀具:" style="font-size: 13px;"/>
|
<separator string="整体式刀具:" style="font-size: 13px;"/>
|
||||||
</div>
|
</div>
|
||||||
@@ -214,7 +236,8 @@
|
|||||||
</group>
|
</group>
|
||||||
</group>
|
</group>
|
||||||
</group>
|
</group>
|
||||||
<group col="1" attrs="{'invisible': ['|',('integral_code_id', '!=', False),('pad_code_id', '!=', False)]}">
|
<group col="1"
|
||||||
|
attrs="{'invisible': ['|',('integral_code_id', '!=', False),('pad_code_id', '!=', False)]}">
|
||||||
<div>
|
<div>
|
||||||
<separator string="刀杆:" style="font-size: 13px;"/>
|
<separator string="刀杆:" style="font-size: 13px;"/>
|
||||||
</div>
|
</div>
|
||||||
@@ -236,7 +259,8 @@
|
|||||||
</group>
|
</group>
|
||||||
</group>
|
</group>
|
||||||
</group>
|
</group>
|
||||||
<group col="1" attrs="{'invisible': ['|',('integral_code_id', '!=', False),('bar_code_id', '!=', False)]}">
|
<group col="1"
|
||||||
|
attrs="{'invisible': ['|',('integral_code_id', '!=', False),('bar_code_id', '!=', False)]}">
|
||||||
<div>
|
<div>
|
||||||
<separator string="刀盘:" style="font-size: 13px;"/>
|
<separator string="刀盘:" style="font-size: 13px;"/>
|
||||||
</div>
|
</div>
|
||||||
@@ -306,20 +330,33 @@
|
|||||||
|
|
||||||
<group string="组装参数信息">
|
<group string="组装参数信息">
|
||||||
<group>
|
<group>
|
||||||
<field name="coarse_middle_thin"/>
|
<field name="barcode_id" readonly="True"/>
|
||||||
<field name="new_former"/>
|
<field name="after_assembly_functional_tool_name" string="功能刀具名称"/>
|
||||||
<field name="tool_loading_length"/>
|
<field name="after_assembly_functional_tool_type_id" string="功能刀具类型"/>
|
||||||
<field name="reference_length"/>
|
<field name="after_assembly_functional_tool_diameter" string="刀具直径(mm)"/>
|
||||||
</group>
|
<field name="after_assembly_knife_tip_r_angle" string="刀尖R角(mm)"/>
|
||||||
<group>
|
<field name="after_assembly_new_former" string="新/旧"/>
|
||||||
<field name="cut_time"/>
|
<field name="cut_time"/>
|
||||||
<field name="cut_length"/>
|
<field name="cut_length"/>
|
||||||
<field name="cut_number"/>
|
<field name="cut_number"/>
|
||||||
</group>
|
</group>
|
||||||
|
<group>
|
||||||
|
<field name="after_assembly_whether_standard_knife" string="是否标准刀"/>
|
||||||
|
<field name="after_assembly_coarse_middle_thin" string="粗/中/精"/>
|
||||||
|
<field name="after_assembly_max_lifetime_value" string="最大寿命值(min)"/>
|
||||||
|
<field name="after_assembly_alarm_value" string="报警值(min)"/>
|
||||||
|
<field name="after_assembly_used_value" string="已使用值(min)"/>
|
||||||
|
<field name="after_assembly_tool_loading_length" string="装刀长(mm)"/>
|
||||||
|
<field name="after_assembly_functional_tool_length" string="伸出长(mm)"/>
|
||||||
|
<field name="after_assembly_effective_length" string="有效长(mm)"/>
|
||||||
|
<field name="L_D_number"/>
|
||||||
|
<field name="hiding_length"/>
|
||||||
|
</group>
|
||||||
</group>
|
</group>
|
||||||
</sheet>
|
</sheet>
|
||||||
<footer>
|
<footer>
|
||||||
<button string="确定" name="functional_tool_assembly" type="object" class="btn-primary" confirm="是否确认申请组装"/>
|
<button string="确定" name="functional_tool_assembly" type="object" class="btn-primary"
|
||||||
|
confirm="是否确认申请组装"/>
|
||||||
<button string="取消" class="btn-secondary" special="cancel"/>
|
<button string="取消" class="btn-secondary" special="cancel"/>
|
||||||
</footer>
|
</footer>
|
||||||
</form>
|
</form>
|
||||||
|
|||||||
Reference in New Issue
Block a user