jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、机台换刀申请及其弹窗新增生产线字段，2、机台换刀申请tree视图搜索面板改为按生产线和状态搜索，3、优化功能刀具组装单，新增大量字段，优化tree试图布局，优化form视图布局，tree视图搜索面板新增按状态搜索，4、重构了机台换刀申请模型申请换刀功能；5、重构刀具转移模型，

Browse Source
This commit is contained in:
yuxianghui
2023-11-20 17:36:13 +08:00
parent c885f3ce8c
commit b49b5890a0
4 changed files with 436 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
sf_tool_management/wizard/wizard.py
View File

@@ -1,3 +1,5 @@
from datetime import timedelta
from odoo import fields, models, api
from odoo.exceptions import ValidationError
@@ -8,6 +10,7 @@ class ToolChangeRequirementInformation(models.TransientModel):
name = fields.Char('名称', related='maintenance_equipment_id.name', store=True, readonly=True)
maintenance_equipment_id = fields.Many2one('maintenance.equipment', string='CNC机床', readonly=True)
production_line_id = fields.Many2one('sf.production.line', string='生产线', 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)
@@ -25,7 +28,7 @@ class ToolChangeRequirementInformation(models.TransientModel):
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)
extension_length = fields.Float(string='伸出长(mm)', readonly=True)
effective_length = fields.Float(string='有效长(mm)', readonly=True)
# 待换功能刀具信息
@@ -34,17 +37,18 @@ class ToolChangeRequirementInformation(models.TransientModel):
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_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='待换刀具粗/中/精')
string='待换刀具粗/中/精', default='3')
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='新/旧')
new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧', default='0')
replacement_whether_standard_knife = fields.Boolean(string='待换刀具是否标准刀', default=True, requried=True)
used_tool_time = fields.Datetime(string='用刀时间')
used_tool_time = fields.Datetime(string='用刀时间',
default=lambda self: fields.Datetime.now() + timedelta(hours=4))
applicant = fields.Char(string='申请人', default=lambda self: self.env.user.name, readonly=True)
reason_for_applying = fields.Char(string='申请原因')
@@ -53,30 +57,40 @@ class ToolChangeRequirementInformation(models.TransientModel):
确认换刀申请（按键）
:return:
"""
# 将数据更新到机台换刀申请界面
print('已运行')
record = self.env['sf.machine.table.tool.changing.apply'].search(
[('maintenance_equipment_id', '=', self.maintenance_equipment_id.id),
('cutter_spacing_code_id', '=', self.cutter_spacing_code_id.id)
])
print('运行record_1')
# 功能刀具组装创建新任务(new_assembly_task)
# 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)
# 功能刀具组装创建新任务(new_assembly_task)
sf_functional_tool_assembly = self.env['sf.functional.tool.assembly'].sudo().create({
'functional_tool_name': self.replacement_tool_name,
'functional_tool_type_id': self.replacement_tool_type_id.id,
'functional_tool_diameter': self.replacement_diameter,
'knife_tip_r_angle': self.replacement_knife_tip_r_angle,
'coarse_middle_thin': self.replacement_tool_coarse_middle_thin,
'new_former': self.new_former,
'tool_loading_length': self.replacement_tool_setting_length,
'functional_tool_length': self.replacement_extension_length,
'effective_length': self.replacement_effective_length,
'loading_task_source': '1',
'use_tool_time': self.used_tool_time,
'production_line_name_id': self.production_line_id.id,
'machine_tool_name_id': self.maintenance_equipment_id.id,
'applicant': self.applicant,
'apply_time': fields.Datetime.now(),
'cutter_spacing_code_id': self.cutter_spacing_code_id.id,
'whether_standard_knife': self.whether_standard_knife,
'reason_for_applying': self.reason_for_applying
})
print('sf_functional_tool_assembly:', sf_functional_tool_assembly)
# 修改机床换刀申请状态
record.write({
'status': '1',
'sf_functional_tool_assembly_id': sf_functional_tool_assembly
})
print('运行成功')
# 关闭弹出窗口
@@ -87,18 +101,35 @@ class ToolTransferRequestInformation(models.TransientModel):
_name = 'sf.tool.transfer.request.information'
_description = '刀具转移申请信息'
CNC_machine_table_id = fields.Many2one('sf.machine_tool', 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)
name = fields.Char('名称', related='maintenance_equipment_id.name', store=True, readonly=True)
maintenance_equipment_id = fields.Many2one('maintenance.equipment', string='CNC机床', readonly=True)
production_line_id = fields.Many2one('sf.production.line', string='生产线', 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)
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)
# 转移刀具信息
transfer_target = fields.Selection([('机台', '机台'),
('线边刀库', '线边刀库'),
('刀具房', '刀具房')], string='转移到:', default='线边刀库')
new_cnc_machine_table_id = fields.Many2one('sf.machine_tool', string='机床名称')
new_production_line_id = fields.Many2one('sf.production.line', string='生产线')
new_machine_tool_code = fields.Char(string='机床号')
new_cutter_spacing_code = fields.Char(string='目标刀位号')
@@ -142,7 +173,8 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
# 整体式刀具型号
integral_code_id = fields.Many2one('stock.lot', string='整体式刀具序列号',
domain=[('product_id.cutting_tool_material_id.name', '=', '整体式刀具')])
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)
sf_tool_brand_id_1 = fields.Many2one('sf.machine.brand', string='整体式刀具品牌', readonly=True)
@@ -156,28 +188,32 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
# 刀杆型号
bar_code_id = fields.Many2one('stock.lot', '刀杆序列号',
domain=[('product_id.cutting_tool_material_id.name', '=', '刀杆')])
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)
sf_tool_brand_id_3 = fields.Many2one('sf.machine.brand', '刀杆品牌', readonly=True)
# 刀盘型号
pad_code_id = fields.Many2one('stock.lot', '刀盘序列号',
domain=[('product_id.cutting_tool_material_id.name', '=', '刀盘')])
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)
sf_tool_brand_id_4 = fields.Many2one('sf.machine.brand', '刀盘品牌', readonly=True)
# 刀柄型号
handle_code_id = fields.Many2one('stock.lot', '刀柄序列号', required=True,
domain=[('product_id.cutting_tool_material_id.name', '=', '刀柄')])
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)
sf_tool_brand_id_5 = fields.Many2one('sf.machine.brand', '刀柄品牌', readonly=True)
# 夹头型号
chuck_code_id = fields.Many2one('stock.lot', '夹头序列号', required=True,
domain=[('product_id.cutting_tool_material_id.name', '=', '夹头')])
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)
@@ -456,4 +492,4 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
'is_standard': self.whether_standard_tool,
'applicable_range': None,
'image': None,
}
}

46
sf_tool_management/wizard/wizard_view.xml
View File

@@ -14,6 +14,7 @@
</div>
<group>
<group>
<field name="production_line_id"/>
<field name="machine_table_type_id"/>
<field name="cutter_spacing_code_id"/>
<field name="tool_position_interface_type"/>
@@ -28,8 +29,8 @@
<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"/>
<field name="extension_length"/>
<field name="effective_length"/>
</group>
</group>
<group string="待换功能刀具信息">
@@ -39,14 +40,14 @@
<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_extension_length" string="伸出长(mm)"/>
<field name="replacement_effective_length" string="有效长(mm)"/>
<field name="replacement_tool_coarse_middle_thin" string="粗/中/精"/>
</group>
<group>
<field name="replacement_max_lifetime_value" string="最大寿命值(min)"/>
<field name="replacement_alarm_value" string="报警值(min)"/>
<field name="replacement_used_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"/>
@@ -80,22 +81,30 @@
<field name="arch" type="xml">
<form string="刀具转移申请信息">
<sheet>
<group string="机床信息">
<div class="oe_title">
<h1>
<field name="maintenance_equipment_id"/>
</h1>
</div>
<group>
<group>
<field name="CNC_machine_table_id"/>
<field name="cutter_spacing_code"/>
<field name="production_line_id"/>
<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="machine_tool_code"/>
</group>
</group>
<group string="功能刀具信息">
<group>
<field name="functional_tool_name_id" string="功能刀具名称"/>
<field name="functional_tool_type_id" string="功能刀具类型"/>
</group>
<group>
<field name="barcode_id" string="功能刀具编码"/>
<field name="barcode_id"/>
<field name="functional_tool_name"/>
<field name="functional_tool_type_id"/>
<field name="diameter"/>
<field name="knife_tip_r_angle"/>
<field name="effective_length"/>
<field name="effective_length"/>
</group>
</group>
<group string="刀具转移">
@@ -105,7 +114,8 @@
</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_machine_tool_code" attrs="{'invisible': [('transfer_target', '!=', '机台')]}"/>
<field name="new_cutter_spacing_code" string="刀位号" attrs="{'invisible': [('transfer_target', '!=', '机台')]}"/>
<field name="magazine_tool_warehouse_district" attrs="{'invisible': [('transfer_target', '!=', '线边刀库')]}"/>