1、设备机床的刀位对象新增name字段,并自动添加值;2、根据需求重构了机床换刀申请模型,重构机床换刀弹窗对象;
This commit is contained in:
@@ -911,5 +911,12 @@ class SfMaintenanceEquipmentTool(models.Model):
|
||||
alarm_value = fields.Char('报警值')
|
||||
used_value = fields.Char('已使用值')
|
||||
code = fields.Char('机床刀位号')
|
||||
name = fields.Char('', compute='_compute_name')
|
||||
|
||||
@api.depends('code')
|
||||
def _compute_name(self):
|
||||
for record in self:
|
||||
if record.code:
|
||||
record.name = record.code
|
||||
|
||||
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
from odoo import fields, models, api
|
||||
from odoo import SUPERUSER_ID
|
||||
from odoo.exceptions import ValidationError
|
||||
|
||||
|
||||
# class FunctionalCuttingToolEntity(models.Model):
|
||||
@@ -68,9 +69,9 @@ class FunctionalCuttingToolEntity(models.Model):
|
||||
related='cutting_tool_integral_model_id.suitable_machining_method_ids')
|
||||
|
||||
blade_tip_characteristics_id = fields.Many2many('maintenance.equipment.image',
|
||||
'rel_blade_tip_product_template_tool_entity', '刀尖特征',
|
||||
domain=[('type', '=', '刀尖特征')],
|
||||
related='cutting_tool_integral_model_id.blade_tip_characteristics_id')
|
||||
'rel_blade_tip_product_template_tool_entity', '刀尖特征',
|
||||
domain=[('type', '=', '刀尖特征')],
|
||||
related='cutting_tool_integral_model_id.blade_tip_characteristics_id')
|
||||
|
||||
handle_type_ids = fields.Many2many('maintenance.equipment.image',
|
||||
'rel_handle_product_template_tool_entity', '柄部类型',
|
||||
@@ -185,7 +186,7 @@ class FunctionalToolWarning(models.Model):
|
||||
return categories.browse(machine_table_name_ids)
|
||||
|
||||
machine_tool_code = fields.Char('机台号', readonly=True, related='functional_tool_assembly_id.machine_tool_code')
|
||||
cutting_tool_code = fields.Char('刀位号', readonly=True, related='functional_tool_assembly_id.cutter_spacing_code')
|
||||
cutting_tool_code = fields.Char('刀位号', readonly=True)
|
||||
# idle_time = fields.Char('闲置时长', readonly=False)
|
||||
idle_time = fields.Char('闲置时长(h)', readonly=False)
|
||||
alarm_value = fields.Char('报警值', readonly=False)
|
||||
@@ -439,60 +440,73 @@ class InboundAndOutboundRecords(models.Model):
|
||||
class MachineTableToolChangingApply(models.Model):
|
||||
_name = 'sf.machine.table.tool.changing.apply'
|
||||
_description = '机床换刀申请'
|
||||
_order = 'cutter_spacing_code_id'
|
||||
|
||||
name = fields.Many2one('maintenance.equipment', string='CNC机床', required=True, readonly=False,
|
||||
group_expand='_read_group_names', domain=[('category_id.equipment_type', '=', '机床')])
|
||||
name = fields.Char('名称', related='maintenance_equipment_id.name', store=True)
|
||||
maintenance_equipment_id = fields.Many2one('maintenance.equipment', string='CNC机床', required=True, readonly=False,
|
||||
group_expand='_read_group_names',
|
||||
domain=[('category_id.equipment_type', '=', '机床')])
|
||||
machine_table_type_id = fields.Many2one('maintenance.equipment.category', string='机床类型', readonly=True,
|
||||
compute='_compute_machine_table_type_id')
|
||||
machine_tool_code = fields.Char(string='机台号', store=True, invisible=True, readonly=True)
|
||||
cutter_spacing_code = fields.Char(string='刀位号', readonly=False, required=True)
|
||||
cutter_spacing_code_id = fields.Many2one('maintenance.equipment.tool', string='刀位号', readonly=False,
|
||||
required=True,
|
||||
domain="[('equipment_id', '=', name)]")
|
||||
barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号',
|
||||
domain=[('product_id.name', '=', '功能刀具')])
|
||||
functional_tool_name = fields.Char(string='功能刀具名称')
|
||||
functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型')
|
||||
functional_tool_name_id = fields.Many2one('product.product', string='功能刀具',
|
||||
domain=[('name', '=', '功能刀具')])
|
||||
tool_position_interface_type = fields.Selection(
|
||||
[('BT刀柄式', 'BT刀柄式'), ('SK刀柄式', 'SK刀柄式'), ('HSK刀柄式', 'HSK刀柄式'),
|
||||
('CAT刀柄式', 'CAT刀柄式'), ('ISO刀盘式', 'ISO刀盘式'), ('DIN刀盘式', 'DIN刀盘式'),
|
||||
('直装固定式', '直装固定式')], string='刀位接口型号')
|
||||
diameter = fields.Integer(string='刀具直径(mm)', requried=True)
|
||||
knife_tip_r_angle = fields.Float(string='刀尖R角(mm)', requried=True)
|
||||
max_lifetime_value = fields.Integer(string='最大寿命值(min)', requried=True)
|
||||
alarm_value = fields.Integer(string='报警值(min)', requried=True)
|
||||
used_value = fields.Integer(string='已使用值(min)', requried=True)
|
||||
whether_standard_knife = fields.Boolean(string='是否标准刀', default=True)
|
||||
extension__length = fields.Float(string='伸出长(mm)', requried=True)
|
||||
effective_length = fields.Float(string='有效长(mm)', requried=True)
|
||||
|
||||
@api.depends('name')
|
||||
functional_tool_status = fields.Selection([('正常', '正常'), ('报警', '报警')], string='功能刀具状态',
|
||||
default='正常')
|
||||
|
||||
assembly_order_code = fields.Char(string='组装单编码', readonly=True)
|
||||
applicant = fields.Char(string='申请人', readonly=True)
|
||||
reason_for_applying = fields.Char(string='申请原因', readonly=True)
|
||||
remark = fields.Char(string='备注说明', readonly=False)
|
||||
|
||||
status = fields.Selection([('0', '未操作'), ('1', '已换刀申请'), ('2', '已转移'), ('3', '已组装')],
|
||||
string='操作状态', default='0')
|
||||
|
||||
sf_functional_tool_assembly_id = fields.Many2one('sf.functional.tool.assembly', '功能刀具组装单', readonly=True)
|
||||
|
||||
@api.depends('maintenance_equipment_id')
|
||||
def _compute_machine_table_type_id(self):
|
||||
for record in self:
|
||||
if record:
|
||||
record.machine_table_type_id = record.name.category_id.id
|
||||
record.machine_tool_code = record.name.code
|
||||
record.machine_table_type_id = record.maintenance_equipment_id.category_id.id
|
||||
record.machine_tool_code = record.maintenance_equipment_id.code
|
||||
else:
|
||||
record.machine_table_type_id = None
|
||||
record.machine_tool_code = None
|
||||
|
||||
barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号',
|
||||
domain=[('product_id.name', '=', '功能刀具')])
|
||||
functional_tool_name_id = fields.Many2one('product.product', string='功能刀具名称',
|
||||
domain=[('name', '=', '功能刀具')])
|
||||
functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型')
|
||||
|
||||
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)
|
||||
max_lifetime_value = fields.Char(string='最大寿命值', readonly=False)
|
||||
alarm_value = fields.Char(string='报警值', readonly=False)
|
||||
used_value = fields.Char(string='已使用值', readonly=False)
|
||||
functional_tool_status = fields.Selection([('正常', '正常'), ('异常', '异常')], string='功能刀具状态',
|
||||
default='正常', readonly=False)
|
||||
|
||||
# replacement_tool_code = fields.Char(string='待换功能刀具编码', readonly=True)
|
||||
assembly_order_code = fields.Char(string='组装单编码', readonly=True)
|
||||
replacement_tool_name_id = fields.Many2one('product.product', string='待换功能刀具名称', readonly=True)
|
||||
replacement_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='待换功能刀具类型',
|
||||
readonly=True)
|
||||
replacement_tool_coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')],
|
||||
string='粗/中/精(待换)', readonly=True)
|
||||
new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧', readonly=True)
|
||||
applicant = fields.Char(string='申请人', readonly=True)
|
||||
used_tool_time = fields.Datetime(string='用刀时间', readonly=True)
|
||||
reason_for_applying = fields.Char(string='申请原因', readonly=True)
|
||||
remark = fields.Char(string='备注说明', readonly=False)
|
||||
|
||||
status = fields.Selection([('0', '未操作'), ('1', '已换刀申请'), ('2', '已转移'), ('3', '已组装')], string='操作状态', default='0')
|
||||
|
||||
sf_functional_tool_assembly_id = fields.Many2one('sf.functional.tool.assembly', '功能刀具组装', readonly=True)
|
||||
@api.constrains("cutter_spacing_code_id")
|
||||
def _check_cutter_spacing_code_id(self):
|
||||
for obj in self:
|
||||
records = self.env['sf.machine.table.tool.changing.apply'].search([
|
||||
('maintenance_equipment_id', '=', obj.maintenance_equipment_id.id),
|
||||
('cutter_spacing_code_id', '=', obj.cutter_spacing_code_id.id)])
|
||||
if len(records) > 1:
|
||||
raise ValidationError('该刀位号已存在,请重新选择!!!')
|
||||
|
||||
@api.model
|
||||
def _read_group_names(self, categories, domain, order):
|
||||
names = categories._search([('category_id.equipment_type', '=', '机床')], order=order, access_rights_uid=SUPERUSER_ID)
|
||||
names = categories._search([('category_id.equipment_type', '=', '机床')], order=order,
|
||||
access_rights_uid=SUPERUSER_ID)
|
||||
return categories.browse(names)
|
||||
|
||||
@api.onchange('functional_tool_status')
|
||||
@@ -503,7 +517,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_name_id': self.functional_tool_name_id.id,
|
||||
@@ -528,7 +542,7 @@ class MachineTableToolChangingApply(models.Model):
|
||||
'use_tool_time': self.used_tool_time,
|
||||
'machine_tool_name': self.CNC_machine_table,
|
||||
'machine_tool_code': self.machine_tool_code,
|
||||
'cutter_spacing_code': self.cutter_spacing_code,
|
||||
'cutter_spacing_code_id': self.cutter_spacing_code_id,
|
||||
})
|
||||
|
||||
def new_assembly_task(self, vals):
|
||||
@@ -646,8 +660,8 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
|
||||
# 将计划执行状态改为执行中
|
||||
self.env['sf.cam.work.order.program.knife.plan'].search(
|
||||
[('barcode_id', '=', self.barcode_id.id)]).write({
|
||||
'plan_execute_status': '1',
|
||||
'applicant': self.env.user.name})
|
||||
'plan_execute_status': '1',
|
||||
'applicant': self.env.user.name})
|
||||
|
||||
def revocation(self):
|
||||
"""
|
||||
@@ -661,10 +675,10 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
|
||||
# 将计划执行状态改为待执行,同时清除申请人、功能刀具组装字段数据
|
||||
self.env['sf.cam.work.order.program.knife.plan'].search(
|
||||
[('barcode_id', '=', self.barcode_id.id)]).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,
|
||||
})
|
||||
|
||||
|
||||
class FunctionalToolAssembly(models.Model):
|
||||
@@ -674,7 +688,8 @@ class FunctionalToolAssembly(models.Model):
|
||||
|
||||
assembly_order_code = fields.Char(string='编码', readonly=True)
|
||||
barcode_id = fields.Many2one('stock.lot', 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)
|
||||
functional_tool_name = fields.Char(string='功能刀具名称', requried=True)
|
||||
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')
|
||||
@@ -691,7 +706,8 @@ class FunctionalToolAssembly(models.Model):
|
||||
|
||||
# 整体式刀具型号
|
||||
integral_code_id = fields.Many2one('stock.lot', string='整体式刀具序列号', readonly=True)
|
||||
cutting_tool_integral_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='整体式刀具型号', readonly=True)
|
||||
cutting_tool_integral_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='整体式刀具型号',
|
||||
readonly=True)
|
||||
integral_name = fields.Char('整体式刀具名称', readonly=True, compute='_compute_auto_fill')
|
||||
sf_tool_brand_id_1 = fields.Many2one('sf.machine.brand', string='整体式刀具品牌', readonly=True)
|
||||
|
||||
@@ -703,25 +719,29 @@ class FunctionalToolAssembly(models.Model):
|
||||
|
||||
# 刀杆型号
|
||||
bar_code_id = fields.Many2one('stock.lot', '刀杆序列号', readonly=True)
|
||||
cutting_tool_cutterbar_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀杆型号', readonly=True)
|
||||
cutting_tool_cutterbar_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀杆型号',
|
||||
readonly=True)
|
||||
bar_name = fields.Char('刀杆名称', readonly=True, compute='_compute_auto_fill')
|
||||
sf_tool_brand_id_3 = fields.Many2one('sf.machine.brand', '刀杆品牌', readonly=True)
|
||||
|
||||
# 刀盘型号
|
||||
pad_code_id = fields.Many2one('stock.lot', '刀盘序列号', readonly=True)
|
||||
cutting_tool_cutterpad_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀盘型号', readonly=True)
|
||||
cutting_tool_cutterpad_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀盘型号',
|
||||
readonly=True)
|
||||
pad_name = fields.Char('刀盘名称', readonly=True, compute='_compute_auto_fill')
|
||||
sf_tool_brand_id_4 = fields.Many2one('sf.machine.brand', '刀盘品牌', readonly=True)
|
||||
|
||||
# 刀柄型号
|
||||
handle_code_id = fields.Many2one('stock.lot', '刀柄序列号', readonly=True)
|
||||
cutting_tool_cutterhandle_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀柄型号', readonly=True)
|
||||
cutting_tool_cutterhandle_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀柄型号',
|
||||
readonly=True)
|
||||
handle_name = fields.Char('刀柄名称', readonly=True, compute='_compute_auto_fill')
|
||||
sf_tool_brand_id_5 = fields.Many2one('sf.machine.brand', '刀柄品牌', readonly=True)
|
||||
|
||||
# 夹头型号
|
||||
chuck_code_id = fields.Many2one('stock.lot', '夹头序列号', readonly=True)
|
||||
cutting_tool_cutterhead_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='夹头型号', readonly=True)
|
||||
cutting_tool_cutterhead_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='夹头型号',
|
||||
readonly=True)
|
||||
chuck_name = fields.Char('夹头名称', readonly=True, compute='_compute_auto_fill')
|
||||
sf_tool_brand_id_6 = fields.Many2one('sf.machine.brand', '夹头品牌', readonly=True)
|
||||
|
||||
@@ -797,7 +817,8 @@ class FunctionalToolAssembly(models.Model):
|
||||
production_line_name_id = fields.Many2one('sf.production.line', string='产线名称', readonly=False)
|
||||
machine_tool_name_id = fields.Many2one('maintenance.equipment', string='机床名称', readonly=True)
|
||||
machine_tool_code = fields.Char(string='机台号', readonly=True)
|
||||
cutter_spacing_code = fields.Char(string='刀位号', readonly=True)
|
||||
# cutter_spacing_code = fields.Char(string='刀位号', readonly=True)
|
||||
cutter_spacing_code_id = fields.Many2one('maintenance.equipment.tool', string='刀位号', readonly=True)
|
||||
|
||||
tool_loading_person = fields.Char(string='装刀人', readonly=True)
|
||||
tool_loading_time = fields.Datetime(string='装刀时间', readonly=True)
|
||||
@@ -806,7 +827,8 @@ class FunctionalToolAssembly(models.Model):
|
||||
remark = fields.Char(string='备注说明', readonly=True)
|
||||
|
||||
check_box_1 = fields.Boolean(string='复选框', default=False, readonly=False)
|
||||
sf_machine_table_tool_changing_apply_id = fields.Many2one('sf.machine.table.tool.changing.apply', '机床换刀申请', readonly=True)
|
||||
sf_machine_table_tool_changing_apply_id = fields.Many2one('sf.machine.table.tool.changing.apply', '机床换刀申请',
|
||||
readonly=True)
|
||||
sf_cam_work_order_program_knife_plan_id = fields.Many2one('sf.cam.work.order.program.knife.plan',
|
||||
'CAM工单程序用刀计划', readonly=True, )
|
||||
|
||||
@@ -859,4 +881,4 @@ class FunctionalToolAssembly(models.Model):
|
||||
code = self._get_code(obj.loading_task_source)
|
||||
obj.assembly_order_code = code
|
||||
obj.name = code
|
||||
return obj
|
||||
return obj
|
||||
|
||||
@@ -707,43 +707,58 @@
|
||||
<field name="model">sf.machine.table.tool.changing.apply</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree>
|
||||
<field name="name"/>
|
||||
<field name="machine_tool_code" invisible="1"/>
|
||||
<field name="name" invisible="1"/>
|
||||
<field name="maintenance_equipment_id"/>
|
||||
<field name="machine_tool_code"/>
|
||||
<field name="machine_table_type_id"/>
|
||||
<field name="cutter_spacing_code"/>
|
||||
<field name="barcode_id"/>
|
||||
<field name="functional_tool_name_id"/>
|
||||
<!-- <field name="replacement_tool_code"/>-->
|
||||
<field name="replacement_tool_name_id"/>
|
||||
<field name="applicant"/>
|
||||
<field name="cutter_spacing_code_id" optional="hide"/>
|
||||
<field name="barcode_id" invisible="1"/>
|
||||
<field name="functional_tool_name"/>
|
||||
<field name="diameter"/>
|
||||
<field name="knife_tip_r_angle"/>
|
||||
<field name="max_lifetime_value"/>
|
||||
<field name="alarm_value"/>
|
||||
<field name="used_value"/>
|
||||
<field name="functional_tool_status" string="状态"/>
|
||||
<field name="applicant" optional="hide"/>
|
||||
|
||||
<field name="functional_tool_type_id" invisible="True"/>
|
||||
<field name="coarse_middle_thin" invisible="True"/>
|
||||
<field name="status" invisible="True"/>
|
||||
<field name="functional_tool_type_id" invisible="1"/>
|
||||
<field name="tool_position_interface_type" invisible="1"/>
|
||||
<field name="extension__length" invisible="1"/>
|
||||
<field name="effective_length" invisible="1"/>
|
||||
<field name="functional_tool_name_id" invisible="1"/>
|
||||
<field name="whether_standard_knife" invisible="1"/>
|
||||
<field name="functional_tool_name" invisible="1"/>
|
||||
<field name="status" invisible="1"/>
|
||||
<button string="换刀申请"
|
||||
name="%(sf_tool_management.sf_tool_change_requirement_information_act)d"
|
||||
type="action"
|
||||
context="{ 'default_name':name,
|
||||
'default_maintenance_equipment_id': maintenance_equipment_id,
|
||||
'default_machine_table_type_id': machine_table_type_id,
|
||||
'default_machine_tool_code': machine_tool_code,
|
||||
'default_cutter_spacing_code_id': cutter_spacing_code_id,
|
||||
'default_barcode_id': barcode_id,
|
||||
'default_functional_tool_name': functional_tool_name,
|
||||
'default_functional_tool_name_id': functional_tool_name_id,
|
||||
'default_functional_tool_type_id': functional_tool_type_id,
|
||||
'default_cutter_spacing_code': cutter_spacing_code,
|
||||
'default_replacement_tool_name_id': functional_tool_name_id,
|
||||
'default_replacement_tool_type_id': functional_tool_type_id,
|
||||
'default_replacement_tool_coarse_middle_thin': coarse_middle_thin}"
|
||||
'default_tool_position_interface_type': tool_position_interface_type,
|
||||
'default_diameter': diameter,
|
||||
'default_knife_tip_r_angle': knife_tip_r_angle,
|
||||
'default_max_lifetime_value': max_lifetime_value,
|
||||
'default_alarm_value': alarm_value,
|
||||
'default_used_value': used_value,
|
||||
'default_whether_standard_knife': whether_standard_knife,
|
||||
'default_extension__length': extension__length,
|
||||
'default_effective_length': effective_length,
|
||||
}"
|
||||
attrs="{'invisible': [('status', '!=', '0')]}"
|
||||
class="btn-primary"
|
||||
/>
|
||||
<button string="转移"
|
||||
name="%(sf_tool_management.sf_tool_transfer_request_information_act)d"
|
||||
type="action"
|
||||
context="{ 'default_CNC_machine_table_id':name,
|
||||
'default_machine_tool_code': machine_tool_code,
|
||||
'default_cutter_spacing_code': cutter_spacing_code,
|
||||
'default_barcode_id': barcode_id,
|
||||
'default_functional_tool_name_id': functional_tool_name_id,
|
||||
'default_functional_tool_type_id': functional_tool_type_id}"
|
||||
context="{}"
|
||||
class="btn-primary"
|
||||
attrs="{'invisible': [('status', '!=', '0')]}"
|
||||
/>
|
||||
@@ -763,26 +778,31 @@
|
||||
name="%(sf_tool_management.sf_tool_change_requirement_information_act)d"
|
||||
type="action"
|
||||
context="{ 'default_name':name,
|
||||
'default_maintenance_equipment_id': maintenance_equipment_id,
|
||||
'default_machine_table_type_id': machine_table_type_id,
|
||||
'default_machine_tool_code': machine_tool_code,
|
||||
'default_cutter_spacing_code_id': cutter_spacing_code_id,
|
||||
'default_barcode_id': barcode_id,
|
||||
'default_functional_tool_name': functional_tool_name,
|
||||
'default_functional_tool_name_id': functional_tool_name_id,
|
||||
'default_functional_tool_type_id': functional_tool_type_id,
|
||||
'default_cutter_spacing_code': cutter_spacing_code,
|
||||
'default_replacement_tool_name_id': functional_tool_name_id,
|
||||
'default_replacement_tool_type_id': functional_tool_type_id,
|
||||
'default_replacement_tool_coarse_middle_thin': coarse_middle_thin}"
|
||||
'default_tool_position_interface_type': tool_position_interface_type,
|
||||
'default_diameter': diameter,
|
||||
'default_knife_tip_r_angle': knife_tip_r_angle,
|
||||
'default_max_lifetime_value': max_lifetime_value,
|
||||
'default_alarm_value': alarm_value,
|
||||
'default_used_value': used_value,
|
||||
'default_whether_standard_knife': whether_standard_knife,
|
||||
'default_extension__length': extension__length,
|
||||
'default_effective_length': effective_length,
|
||||
}"
|
||||
attrs="{'invisible': [('status', '!=', '0')]}"
|
||||
class="btn-primary"
|
||||
/>
|
||||
<button string="转移"
|
||||
name="%(sf_tool_management.sf_tool_transfer_request_information_act)d"
|
||||
type="action"
|
||||
context="{ 'default_CNC_machine_table_id':name,
|
||||
'default_machine_tool_code': machine_tool_code,
|
||||
'default_cutter_spacing_code': cutter_spacing_code,
|
||||
'default_barcode_id': barcode_id,
|
||||
'default_functional_tool_name_id': functional_tool_name_id,
|
||||
'default_functional_tool_type_id': functional_tool_type_id}"
|
||||
context="{}"
|
||||
class="btn-primary"
|
||||
attrs="{'invisible': [('status', '!=', '0')]}"/>
|
||||
<button string="撤回换刀申请" name="revocation_1" type="object" class="btn-primary" attrs="{'invisible': [('status', '!=', '1')]}" confirm="是否确认撤回换刀申请"/>
|
||||
@@ -791,60 +811,39 @@
|
||||
<sheet>
|
||||
<div class="oe_title">
|
||||
<h1>
|
||||
<field name="name" readonly="0" placeholder="请选择"/>
|
||||
<field name="maintenance_equipment_id" readonly="0" placeholder="请选择"/>
|
||||
</h1>
|
||||
</div>
|
||||
<group>
|
||||
<group>
|
||||
<field name="machine_tool_code" invisible="True"/>
|
||||
<field name="machine_table_type_id"/>
|
||||
<field name="cutter_spacing_code"/>
|
||||
<field name="cutter_spacing_code_id"/>
|
||||
<field name="tool_position_interface_type"/>
|
||||
<field name="sf_functional_tool_assembly_id" string="组装单"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="barcode_id"/>
|
||||
<field name="functional_tool_name_id" placeholder="请选择"/>
|
||||
<field name="functional_tool_type_id"/>
|
||||
</group>
|
||||
</group>
|
||||
<field name="name" invisible="True"/>
|
||||
<field name="machine_tool_code" invisible="True"/>
|
||||
<field name="functional_tool_name_id" invisible="True"/>
|
||||
<field name="whether_standard_knife" invisible="True"/>
|
||||
<field name="status" invisible="True"/>
|
||||
<notebook>
|
||||
<page string="待换功能刀具信息">
|
||||
<group attrs="{'invisible': [('sf_functional_tool_assembly_id', '=', False)]}">
|
||||
<group>
|
||||
<field name="replacement_tool_name_id"/>
|
||||
<field name="replacement_tool_type_id"/>
|
||||
<field name="replacement_tool_coarse_middle_thin"/>
|
||||
<field name="applicant"/>
|
||||
<field name="status" invisible="True"/>
|
||||
</group>
|
||||
<group>
|
||||
<!-- <field name="replacement_tool_code"/>-->
|
||||
<field name="used_tool_time"/>
|
||||
<field name="new_former"/>
|
||||
<field name="reason_for_applying" />
|
||||
</group>
|
||||
</group>
|
||||
</page>
|
||||
<page string="数据信息">
|
||||
<page string="功能刀具信息">
|
||||
<group>
|
||||
<group>
|
||||
<field name="hilt_name"/>
|
||||
<field name="barcode_id"/>
|
||||
<field name="functional_tool_name"/>
|
||||
<field name="functional_tool_type_id"/>
|
||||
<field name="diameter"/>
|
||||
<field name="coarse_middle_thin"/>
|
||||
<field name="functional_tool_status"/>
|
||||
<field name="knife_tip_r_angle"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="hilt_code"/>
|
||||
<field name="max_lifetime_value"/>
|
||||
<field name="alarm_value"/>
|
||||
<field name="used_value"/>
|
||||
</group>
|
||||
</group>
|
||||
</page>
|
||||
<page string="其他">
|
||||
<group>
|
||||
<group>
|
||||
<field name="remark"/>
|
||||
<field name="extension__length"/>
|
||||
<field name="effective_length"/>
|
||||
<field name="whether_standard_knife"/>
|
||||
</group>
|
||||
</group>
|
||||
</page>
|
||||
@@ -858,17 +857,22 @@
|
||||
<field name="model">sf.machine.table.tool.changing.apply</field>
|
||||
<field name="arch" type="xml">
|
||||
<search>
|
||||
<field name="name"/>
|
||||
<field name="machine_tool_code" invisible="1"/>
|
||||
<field name="name" invisible="1"/>
|
||||
<field name="maintenance_equipment_id"/>
|
||||
<field name="machine_tool_code"/>
|
||||
<field name="machine_table_type_id"/>
|
||||
<field name="cutter_spacing_code"/>
|
||||
<field name="barcode_id"/>
|
||||
<field name="functional_tool_name_id"/>
|
||||
<!-- <field name="replacement_tool_code"/>-->
|
||||
<field name="replacement_tool_name_id"/>
|
||||
<field name="applicant"/>
|
||||
<field name="cutter_spacing_code_id" optional="hide"/>
|
||||
<field name="barcode_id" invisible="1"/>
|
||||
<field name="functional_tool_name"/>
|
||||
<field name="diameter"/>
|
||||
<field name="knife_tip_r_angle"/>
|
||||
<field name="max_lifetime_value"/>
|
||||
<field name="alarm_value"/>
|
||||
<field name="used_value"/>
|
||||
<field name="functional_tool_status"/>
|
||||
<field name="applicant" optional="hide"/>
|
||||
<searchpanel>
|
||||
<field name="name" enable_counters="1" icon="fa-building"/>
|
||||
<field name="maintenance_equipment_id" enable_counters="1" icon="fa-building"/>
|
||||
</searchpanel>
|
||||
</search>
|
||||
</field>
|
||||
@@ -1017,7 +1021,7 @@
|
||||
|
||||
<field name="machine_tool_name_id" invisible="True"/>
|
||||
<field name="machine_tool_code" invisible="True"/>
|
||||
<field name="cutter_spacing_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"/>
|
||||
@@ -1029,7 +1033,7 @@
|
||||
'default_machine_tool_name_id': machine_tool_name_id,
|
||||
'default_machine_tool_code': machine_tool_code,
|
||||
'default_barcode_id': barcode_id,
|
||||
'default_cutter_spacing_code': cutter_spacing_code,
|
||||
'default_cutter_spacing_code_id': cutter_spacing_code_id,
|
||||
'default_functional_tool_name_id': functional_tool_name_id,
|
||||
'default_functional_tool_type_id': functional_tool_type_id,
|
||||
'default_functional_tool_length': functional_tool_length,
|
||||
@@ -1060,7 +1064,7 @@
|
||||
'default_machine_tool_name_id': machine_tool_name_id,
|
||||
'default_machine_tool_code': machine_tool_code,
|
||||
'default_barcode_id': barcode_id,
|
||||
'default_cutter_spacing_code': cutter_spacing_code,
|
||||
'default_cutter_spacing_code_id': cutter_spacing_code_id,
|
||||
'default_functional_tool_name_id': functional_tool_name_id,
|
||||
'default_functional_tool_type_id': functional_tool_type_id,
|
||||
'default_functional_tool_length': functional_tool_length,
|
||||
@@ -1212,7 +1216,7 @@
|
||||
<field name="production_line_name_id"/>
|
||||
<field name="machine_tool_name_id"/>
|
||||
<field name="machine_tool_code"/>
|
||||
<field name="cutter_spacing_code"/>
|
||||
<field name="cutter_spacing_code_id"/>
|
||||
<field name="applicant"/>
|
||||
</group>
|
||||
<group>
|
||||
|
||||
@@ -6,28 +6,47 @@ class ToolChangeRequirementInformation(models.TransientModel):
|
||||
_name = 'sf.tool.change.requirement.information'
|
||||
_description = '换刀需求信息'
|
||||
|
||||
# tool_change_to_apply_id = fields.Many2one('sf.machine.table.tool.changing.apply', string='机床换刀申请')
|
||||
name = fields.Char('名称', related='maintenance_equipment_id.name', store=True, readonly=True)
|
||||
maintenance_equipment_id = fields.Many2one('maintenance.equipment', string='CNC机床', readonly=True)
|
||||
machine_table_type_id = fields.Many2one('maintenance.equipment.category', string='机床类型', readonly=True)
|
||||
machine_tool_code = fields.Char(string='机台号', store=True, invisible=True, readonly=True)
|
||||
cutter_spacing_code_id = fields.Many2one('maintenance.equipment.tool', string='刀位号', readonly=True)
|
||||
|
||||
name = fields.Many2one('maintenance.equipment', string='CNC机床', readonly=True)
|
||||
machine_tool_code = fields.Char(string='机台号', readonly=True)
|
||||
cutter_spacing_code = fields.Char(string='刀位号', readonly=True)
|
||||
# functional_tool_code = fields.Char(string='功能刀具编码', readonly=True)
|
||||
barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True)
|
||||
functional_tool_name_id = fields.Many2one('product.product', string='功能刀具名称', readonly=True)
|
||||
functional_tool_name = fields.Char(string='功能刀具名称', readonly=True)
|
||||
functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True)
|
||||
tool_position_interface_type = fields.Selection(
|
||||
[('BT刀柄式', 'BT刀柄式'), ('SK刀柄式', 'SK刀柄式'), ('HSK刀柄式', 'HSK刀柄式'),
|
||||
('CAT刀柄式', 'CAT刀柄式'), ('ISO刀盘式', 'ISO刀盘式'), ('DIN刀盘式', 'DIN刀盘式'),
|
||||
('直装固定式', '直装固定式')], string='刀位接口型号', readonly=True)
|
||||
diameter = fields.Integer(string='刀具直径(mm)', readonly=True)
|
||||
knife_tip_r_angle = fields.Float(string='刀尖R角(mm)', readonly=True)
|
||||
max_lifetime_value = fields.Integer(string='最大寿命值(min)', readonly=True)
|
||||
alarm_value = fields.Integer(string='报警值(min)', readonly=True)
|
||||
used_value = fields.Integer(string='已使用值(min)', readonly=True)
|
||||
whether_standard_knife = fields.Boolean(string='是否标准刀', default=True, readonly=True)
|
||||
extension__length = fields.Float(string='伸出长(mm)', readonly=True)
|
||||
effective_length = fields.Float(string='有效长(mm)', readonly=True)
|
||||
|
||||
# replacement_tool_code = fields.Char(string='待换功能刀具编码', readonly=True)
|
||||
replacement_tool_name_id = fields.Many2one('product.product', string='待换功能刀具名称',
|
||||
domain=[('name', '=', '功能刀具')])
|
||||
# 待换功能刀具信息
|
||||
replacement_tool_name = fields.Char(string='待换功能刀具名称')
|
||||
replacement_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='待换功能刀具类型')
|
||||
replacement_diameter = fields.Integer(string='待换刀具直径(mm)', requried=True)
|
||||
replacement_knife_tip_r_angle = fields.Float(string='待换刀具刀尖R角(mm)', requried=True)
|
||||
replacement_tool_setting_length = fields.Float(string='待换刀具装刀长(mm)', requried=True)
|
||||
replacement_extension__length = fields.Float(string='待换刀具伸出长(mm)', requried=True)
|
||||
replacement_effective_length = fields.Float(string='待换刀具有效长(mm)', requried=True)
|
||||
replacement_tool_coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')],
|
||||
string='粗/中/精')
|
||||
new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧')
|
||||
applicant = fields.Char(string='申请人', default=lambda self: self.env.user.name, readonly=True)
|
||||
used_tool_time = fields.Datetime(string='用刀时间')
|
||||
reason_for_applying = fields.Char(string='申请原因')
|
||||
remark = fields.Char(string='备注说明')
|
||||
string='待换刀具粗/中/精')
|
||||
|
||||
replacement_max_lifetime_value = fields.Integer(string='待换刀具最大寿命值(min)', requried=True)
|
||||
replacement_alarm_value = fields.Integer(string='待换刀具报警值(min)', requried=True)
|
||||
replacement_used_value = fields.Integer(string='待换刀具已使用值(min)', requried=True)
|
||||
new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧')
|
||||
replacement_whether_standard_knife = fields.Boolean(string='待换刀具是否标准刀', default=True, requried=True)
|
||||
used_tool_time = fields.Datetime(string='用刀时间')
|
||||
applicant = fields.Char(string='申请人', default=lambda self: self.env.user.name, readonly=True)
|
||||
reason_for_applying = fields.Char(string='申请原因')
|
||||
|
||||
def tool_changing_apply(self):
|
||||
"""
|
||||
@@ -37,44 +56,27 @@ class ToolChangeRequirementInformation(models.TransientModel):
|
||||
# 将数据更新到机台换刀申请界面
|
||||
print('已运行')
|
||||
record = self.env['sf.machine.table.tool.changing.apply'].search(
|
||||
[('name', '=', self.name.id),
|
||||
('machine_tool_code', '=', self.machine_tool_code),
|
||||
('cutter_spacing_code', '=', self.cutter_spacing_code),
|
||||
[('maintenance_equipment_id', '=', self.maintenance_equipment_id.id),
|
||||
('cutter_spacing_code_id', '=', self.cutter_spacing_code_id.id)
|
||||
])
|
||||
print('运行record_1')
|
||||
# 功能刀具组装创建新任务(new_assembly_task)
|
||||
record_1 = self.env['sf.functional.tool.assembly'].sudo().create({
|
||||
'functional_tool_name_id': self.replacement_tool_name_id.id,
|
||||
'functional_tool_type_id': self.replacement_tool_type_id.id,
|
||||
'loading_task_source': '1',
|
||||
'applicant': self.applicant,
|
||||
'reason_for_applying': self.reason_for_applying,
|
||||
'use_tool_time': self.used_tool_time,
|
||||
'machine_tool_name_id': self.name.id,
|
||||
'machine_tool_code': self.machine_tool_code,
|
||||
'cutter_spacing_code': self.cutter_spacing_code,
|
||||
'sf_machine_table_tool_changing_apply_id': record.id,
|
||||
})
|
||||
print('record_1:', record_1)
|
||||
# 封装数据
|
||||
desc = {
|
||||
'name': self.name.id,
|
||||
'assembly_order_code': record_1.assembly_order_code,
|
||||
'machine_tool_code': self.machine_tool_code,
|
||||
'cutter_spacing_code': self.cutter_spacing_code,
|
||||
'replacement_tool_name_id': self.replacement_tool_name_id.id,
|
||||
'replacement_tool_type_id': self.replacement_tool_type_id.id,
|
||||
'replacement_tool_coarse_middle_thin': self.replacement_tool_coarse_middle_thin,
|
||||
'new_former': self.new_former,
|
||||
'applicant': self.applicant,
|
||||
'used_tool_time': self.used_tool_time,
|
||||
'reason_for_applying': self.reason_for_applying,
|
||||
'remark': self.new_former,
|
||||
'status': '1',
|
||||
'sf_functional_tool_assembly_id': record_1.id,
|
||||
}
|
||||
print('运行record.write(desc):')
|
||||
record.write(desc)
|
||||
# todo
|
||||
# record_1 = self.env['sf.functional.tool.assembly'].sudo().create({
|
||||
# 'functional_tool_name_id': self.replacement_tool_name_id.id,
|
||||
# 'functional_tool_type_id': self.replacement_tool_type_id.id,
|
||||
# 'loading_task_source': '1',
|
||||
# 'applicant': self.applicant,
|
||||
# 'reason_for_applying': self.reason_for_applying,
|
||||
# 'use_tool_time': self.used_tool_time,
|
||||
# 'machine_tool_name_id': self.name.id,
|
||||
# 'machine_tool_code': self.machine_tool_code,
|
||||
# 'cutter_spacing_code': self.cutter_spacing_code,
|
||||
# 'sf_machine_table_tool_changing_apply_id': record.id,
|
||||
# })
|
||||
# print('record_1:', record_1)
|
||||
|
||||
# record.write(desc)
|
||||
print('运行成功')
|
||||
|
||||
# 关闭弹出窗口
|
||||
|
||||
@@ -7,30 +7,50 @@
|
||||
<field name="arch" type="xml">
|
||||
<form string="换刀需求信息">
|
||||
<sheet>
|
||||
<group string="机床信息" col="3">
|
||||
<div class="oe_title">
|
||||
<h1>
|
||||
<field name="maintenance_equipment_id"/>
|
||||
</h1>
|
||||
</div>
|
||||
<group>
|
||||
<group>
|
||||
<field name="machine_table_type_id"/>
|
||||
<field name="cutter_spacing_code_id"/>
|
||||
<field name="tool_position_interface_type"/>
|
||||
<field name="max_lifetime_value"/>
|
||||
<field name="alarm_value"/>
|
||||
<field name="alarm_value"/>
|
||||
<field name="whether_standard_knife"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="name"/>
|
||||
<field name="barcode_id"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="machine_tool_code"/>
|
||||
<field name="functional_tool_name_id"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="cutter_spacing_code"/>
|
||||
<field name="functional_tool_name"/>
|
||||
<field name="functional_tool_type_id"/>
|
||||
<field name="diameter"/>
|
||||
<field name="knife_tip_r_angle"/>
|
||||
<field name="knife_tip_r_angle"/>
|
||||
<field name="knife_tip_r_angle"/>
|
||||
</group>
|
||||
</group>
|
||||
<group string="功能刀具信息">
|
||||
<group string="待换功能刀具信息">
|
||||
<group>
|
||||
<field name="replacement_tool_name_id" placeholder="请选择"/>
|
||||
<field name="replacement_tool_type_id"/>
|
||||
<field name="replacement_tool_coarse_middle_thin" placeholder="请选择"/>
|
||||
<field name="applicant"/>
|
||||
<field name="replacement_tool_name" string="功能刀具名称"/>
|
||||
<field name="replacement_tool_type_id" string="功能刀具类型"/>
|
||||
<field name="replacement_diameter" string="刀具直径(mm)"/>
|
||||
<field name="replacement_knife_tip_r_angle" string="刀尖R角(mm)"/>
|
||||
<field name="replacement_tool_setting_length" string="装刀长(mm)"/>
|
||||
<field name="replacement_extension__length" string="伸出长(mm)"/>
|
||||
<field name="replacement_effective_length" string="有效长(mm)"/>
|
||||
<field name="replacement_tool_coarse_middle_thin" string="粗/中/精"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="used_tool_time" placeholder="请选择"/>
|
||||
<field name="new_former" placeholder="请选择"/>
|
||||
<field name="replacement_max_lifetime_value" string="最大寿命值(min)"/>
|
||||
<field name="replacement_alarm_value" string="报警值(min)"/>
|
||||
<field name="replacement_used_value" string="报警值(min)"/>
|
||||
<field name="new_former"/>
|
||||
<field name="replacement_whether_standard_knife" string="是否标准刀"/>
|
||||
<field name="used_tool_time"/>
|
||||
<field name="applicant"/>
|
||||
<field name="reason_for_applying"/>
|
||||
</group>
|
||||
</group>
|
||||
|
||||
Reference in New Issue
Block a user