From 329d7b6464b2c146991a0f4210ae98f5d158c0c5 Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Thu, 16 Nov 2023 17:36:09 +0800 Subject: [PATCH 1/5] =?UTF-8?q?1=E3=80=81=E6=9C=BA=E5=BA=8A=E6=8D=A2?= =?UTF-8?q?=E5=88=80=E7=94=B3=E8=AF=B7=E7=95=8C=E9=9D=A2=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E9=9D=A2=E6=9D=BF=E5=92=8C=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=A0=B9=E6=8D=AE=E8=AE=BE=E5=A4=87=E7=9A=84?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=B1=BB=E5=9E=8B=E7=AD=89=E4=BA=8E=E6=9C=BA?= =?UTF-8?q?=E5=BA=8A=E7=9A=84=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6=EF=BC=9B?= =?UTF-8?q?2=E3=80=81=E9=9A=90=E8=97=8F=E5=8A=9F=E8=83=BD=E5=88=80?= =?UTF-8?q?=E5=85=B7=E5=87=BA=E5=85=A5=E5=BA=93=E8=AE=B0=E5=BD=95=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=EF=BC=9B3=E3=80=81=E5=8A=9F=E8=83=BD=E5=88=80?= =?UTF-8?q?=E5=85=B7=E5=88=97=E8=A1=A8form=E8=A7=86=E5=9B=BE=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E9=A2=84=E8=AD=A6=E8=B7=B3=E8=BD=AC=E6=8C=89=E9=94=AE?= =?UTF-8?q?=EF=BC=88=E8=B7=B3=E8=BD=AC=E5=8A=9F=E8=83=BD=E6=9C=AA=E5=AE=8C?= =?UTF-8?q?=E6=88=90=EF=BC=89=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_tool_management/models/base.py | 7 +- sf_tool_management/views/menu_view.xml | 14 +-- sf_tool_management/views/tool_base_views.xml | 13 +++ sf_tool_management/wizard/wizard.py | 113 +++++++++++-------- 4 files changed, 92 insertions(+), 55 deletions(-) diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py index 1fb775c3..31633de3 100644 --- a/sf_tool_management/models/base.py +++ b/sf_tool_management/models/base.py @@ -94,6 +94,9 @@ class FunctionalCuttingToolEntity(models.Model): functional_tool_model_ids.append(functional_tool_model.id) return [(6, 0, functional_tool_model_ids)] + def open_functional_tool_warning(self): + pass + class FunctionalToolWarning(models.Model): _name = 'sf.functional.tool.warning' @@ -438,7 +441,7 @@ class MachineTableToolChangingApply(models.Model): _description = '机床换刀申请' name = fields.Many2one('maintenance.equipment', string='CNC机床', required=True, readonly=False, - group_expand='_read_group_names') + 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) @@ -489,7 +492,7 @@ class MachineTableToolChangingApply(models.Model): @api.model def _read_group_names(self, categories, domain, order): - names = categories._search([], 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') diff --git a/sf_tool_management/views/menu_view.xml b/sf_tool_management/views/menu_view.xml index 301233c4..5b1ed7e9 100644 --- a/sf_tool_management/views/menu_view.xml +++ b/sf_tool_management/views/menu_view.xml @@ -32,13 +32,13 @@ parent="menu_sf_tool_manage" /> - + + + + + + +
+
+ +

diff --git a/sf_tool_management/wizard/wizard.py b/sf_tool_management/wizard/wizard.py index 53d7f28a..b5a5b5d0 100644 --- a/sf_tool_management/wizard/wizard.py +++ b/sf_tool_management/wizard/wizard.py @@ -166,14 +166,14 @@ class FunctionalToolAssemblyOrder(models.TransientModel): sf_tool_brand_id_4 = fields.Many2one('sf.machine.brand', '刀盘品牌', readonly=True) # 刀柄型号 - handle_code_id = fields.Many2one('stock.lot', '刀柄序列号', + 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) 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', '夹头序列号', + 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) chuck_name = fields.Char('夹头名称', readonly=True, compute='_compute_auto_fill') @@ -269,58 +269,25 @@ class FunctionalToolAssemblyOrder(models.TransientModel): 功能刀具组装 :return: """ + # 对物料做必填判断 + self.materials_must_be_judged() + # 创建组装入库单 # 创建功能刀具批次/序列号记录 stock_lot = self.create_assemble_warehouse_receipt() # 创建刀具组装入库单 self.create_stocking_picking(stock_lot) - desc_1 = { - 'barcode_id': stock_lot.id, - 'integral_code_id': self.integral_code_id.id, - 'blade_code_id': self.blade_code_id.id, - 'bar_code_id': self.bar_code_id.id, - 'pad_code_id': self.pad_code_id.id, - 'handle_code_id': self.handle_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, - 'new_former': self.new_former, - 'reference_length': self.reference_length, - 'cut_time': self.cut_time, - 'cut_length': self.cut_length, - 'cut_number': self.cut_number, - 'assemble_status': '1', - 'tool_loading_person': self.env.user.name, - 'tool_loading_time': fields.Datetime.now() - } + # 封装功能刀具数据 + desc_1 = self.get_desc_1(stock_lot) functional_tool_assembly = self.env['sf.functional.tool.assembly'].search([ ('machine_tool_name_id', '=', self.machine_tool_name_id.id), ('cutter_spacing_code', '=', self.cutter_spacing_code), ('assemble_status', '=', '0'), ]) + + # 创建功能刀具列表记录 # 封装功能刀具数据 - desc_2 = { - 'barcode_id': stock_lot.id, - 'functional_tool_name_id': self.functional_tool_name_id.id, - 'mrs_cutting_tool_type_id': self.functional_tool_type_id.id, - 'cutting_tool_integral_model_id': self.integral_code_id.product_id.id, - 'cutting_tool_blade_model_id': self.blade_code_id.product_id.id, - 'cutting_tool_cutterbar_model_id': self.bar_code_id.product_id.id, - 'cutting_tool_cutterpad_model_id': self.pad_code_id.product_id.id, - 'cutting_tool_cutterhandle_model_id': self.handle_code_id.product_id.id, - 'cutting_tool_cutterhead_model_id': self.chuck_code_id.product_id.id, - 'diameter': self.functional_tool_diameter, - 'tool_grade': None, - 'machining_accuracy': None, - 'tool_length': self.tool_loading_length, - 'blade_number': None, - 'integral_blade_length': None, - 'effective_blade_length': self.effective_length, - 'max_life': None, - 'is_standard': self.whether_standard_tool, - 'applicable_range': None, - 'image': None, - } + desc_2 = self.get_desc_2(stock_lot) # 创建功能刀具列表、功能刀具预警、功能刀具实时分布、功能刀具出入库记录 record_1 = self.env['sf.functional.cutting.tool.entity'].create(desc_2) self.env['sf.functional.tool.warning'].create({ @@ -335,7 +302,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel): 'functional_cutting_tool_id': record_1.id }) - # 修改功能刀具组装信息 + # 修改功能刀具组装单信息 functional_tool_assembly.write(desc_1) if functional_tool_assembly.sf_machine_table_tool_changing_apply_id: @@ -352,6 +319,16 @@ class FunctionalToolAssemblyOrder(models.TransientModel): # 关闭弹出窗口 return {'type': 'ir.actions.act_window_close'} + def materials_must_be_judged(self): + """ + 功能刀具组装物料必填判断 + """ + if not self.integral_code_id and not self.blade_code_id: + raise ValidationError('【整体式刀具】和【刀片】必须填写一个！') + if self.blade_code_id: + if not self.bar_code_id and not self.pad_code_id: + raise ValidationError('【刀盘】和【刀杆】必须填写一个！') + def create_stocking_picking(self, stock_lot): """ 创建刀具组装入库单 @@ -413,7 +390,6 @@ class FunctionalToolAssemblyOrder(models.TransientModel): 'qty_done': 1.0, 'state': 'done' }) - return stock_move_id, stock_move_line_id def get_stock_lot_name(self): @@ -433,4 +409,49 @@ class FunctionalToolAssemblyOrder(models.TransientModel): else: m = int(stock_lot_id.name[-3:]) + 1 num = "%03d" % m - return code + str(num) \ No newline at end of file + return code + str(num) + + def get_desc_1(self, stock_lot): + return { + 'barcode_id': stock_lot.id, + 'integral_code_id': self.integral_code_id.id, + 'blade_code_id': self.blade_code_id.id, + 'bar_code_id': self.bar_code_id.id, + 'pad_code_id': self.pad_code_id.id, + 'handle_code_id': self.handle_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, + 'new_former': self.new_former, + 'reference_length': self.reference_length, + 'cut_time': self.cut_time, + 'cut_length': self.cut_length, + 'cut_number': self.cut_number, + 'assemble_status': '1', + 'tool_loading_person': self.env.user.name, + 'tool_loading_time': fields.Datetime.now() + } + + def get_desc_2(self, stock_lot): + return { + 'barcode_id': stock_lot.id, + 'functional_tool_name_id': self.functional_tool_name_id.id, + 'mrs_cutting_tool_type_id': self.functional_tool_type_id.id, + 'cutting_tool_integral_model_id': self.integral_code_id.product_id.id, + 'cutting_tool_blade_model_id': self.blade_code_id.product_id.id, + 'cutting_tool_cutterbar_model_id': self.bar_code_id.product_id.id, + 'cutting_tool_cutterpad_model_id': self.pad_code_id.product_id.id, + 'cutting_tool_cutterhandle_model_id': self.handle_code_id.product_id.id, + 'cutting_tool_cutterhead_model_id': self.chuck_code_id.product_id.id, + 'diameter': self.functional_tool_diameter, + 'tool_grade': None, + 'machining_accuracy': None, + 'tool_length': self.tool_loading_length, + 'blade_number': None, + 'integral_blade_length': None, + 'effective_blade_length': self.effective_length, + 'max_life': None, + 'is_standard': self.whether_standard_tool, + 'applicable_range': None, + 'image': None, + } \ No newline at end of file From c885f3ce8c320a08f663231e6c8eba724a2f6e52 Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Fri, 17 Nov 2023 17:30:37 +0800 Subject: [PATCH 2/5] =?UTF-8?q?1=E3=80=81=E8=AE=BE=E5=A4=87=E6=9C=BA?= =?UTF-8?q?=E5=BA=8A=E7=9A=84=E5=88=80=E4=BD=8D=E5=AF=B9=E8=B1=A1=E6=96=B0?= =?UTF-8?q?=E5=A2=9Ename=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=B9=B6=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E6=B7=BB=E5=8A=A0=E5=80=BC=EF=BC=9B2=E3=80=81?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E9=9C=80=E6=B1=82=E9=87=8D=E6=9E=84=E4=BA=86?= =?UTF-8?q?=E6=9C=BA=E5=BA=8A=E6=8D=A2=E5=88=80=E7=94=B3=E8=AF=B7=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B=EF=BC=8C=E9=87=8D=E6=9E=84=E6=9C=BA=E5=BA=8A=E6=8D=A2?= =?UTF-8?q?=E5=88=80=E5=BC=B9=E7=AA=97=E5=AF=B9=E8=B1=A1=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/models/product_template.py | 7 + sf_tool_management/models/base.py | 142 +++++++++------- sf_tool_management/views/tool_base_views.xml | 166 ++++++++++--------- sf_tool_management/wizard/wizard.py | 102 ++++++------ sf_tool_management/wizard/wizard_view.xml | 52 ++++-- 5 files changed, 262 insertions(+), 207 deletions(-) diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py index b6961fda..4e3da687 100644 --- a/sf_manufacturing/models/product_template.py +++ b/sf_manufacturing/models/product_template.py @@ -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 diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py index 31633de3..5f275253 100644 --- a/sf_tool_management/models/base.py +++ b/sf_tool_management/models/base.py @@ -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 \ No newline at end of file + return obj diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml index 6b8e7982..b9dd679b 100644 --- a/sf_tool_management/views/tool_base_views.xml +++ b/sf_tool_management/views/tool_base_views.xml @@ -707,43 +707,58 @@ sf.machine.table.tool.changing.apply - - + + + - - - - - - + + + + + + + + + + - - - + + + + + + + + -

@@ -47,7 +48,8 @@

- + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - @@ -161,8 +165,8 @@ sf.functional.cutting.tool.entity - - + + @@ -177,7 +181,7 @@ - + 功能刀具列表 ir.actions.act_window sf.functional.cutting.tool.entity @@ -185,13 +189,13 @@ - + sf.functional.tool.warning.tree sf.functional.tool.warning - - + + @@ -217,7 +221,7 @@ sf.functional.tool.warning.form sf.functional.tool.warning - +

@@ -311,9 +315,9 @@ sf.functional.tool.warning - - - + + + @@ -330,7 +334,8 @@ - + @@ -344,12 +349,12 @@ - + 功能刀具实时分布 sf.real.time.distribution.of.functional.tools - + @@ -378,7 +383,7 @@ 功能刀具实时分布 sf.real.time.distribution.of.functional.tools - +

@@ -500,7 +505,7 @@ - + 功能刀具出入库记录 @@ -519,7 +524,7 @@ - + @@ -601,7 +606,7 @@ - + @@ -631,7 +636,7 @@ - + @@ -647,7 +652,7 @@ - + 出入库记录 sf.inbound.and.outbound.records @@ -701,18 +706,17 @@ - + 机床换刀申请 sf.machine.table.tool.changing.apply + - - - + @@ -722,18 +726,21 @@ + + - +

+ @@ -28,8 +29,8 @@ - - + + @@ -39,14 +40,14 @@ - + - + @@ -80,22 +81,30 @@ - +
+

+ +

+
+ - - + + + + + + + + - - - - - - - - - - + + + + + + + @@ -105,7 +114,8 @@ - + + From 8a1dfe14e6cb49d4526265ee12519403f250ae5c Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Tue, 21 Nov 2023 17:26:18 +0800 Subject: [PATCH 4/5] =?UTF-8?q?1=E3=80=81=E5=8A=9F=E8=83=BD=E5=88=80?= =?UTF-8?q?=E5=85=B7=E5=88=97=E8=A1=A8=E6=A8=A1=E5=9E=8B=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=83=A8=E5=88=86=E5=AD=97=E6=AE=B5=EF=BC=9B2=E3=80=81?= =?UTF-8?q?=E6=9C=BA=E5=8F=B0=E6=8D=A2=E5=88=80=E7=94=B3=E8=AF=B7=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=A0=B9=E6=8D=AE=E6=8A=A5=E8=AD=A6=E5=80=BC=E5=92=8C?= =?UTF-8?q?=E6=9C=89=E6=95=88=E5=80=BC=E8=AE=A1=E7=AE=97=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E7=8A=B6=E6=80=81=EF=BC=8C=E9=87=8D=E6=9E=84=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E8=87=AA=E5=8A=A8=E6=8D=A2=E5=88=80=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E7=9A=84=E5=8A=9F=E8=83=BD=EF=BC=8C=E9=87=8D=E6=9E=84?= =?UTF-8?q?=E6=92=A4=E9=94=80=E6=8D=A2=E5=88=80=E7=94=B3=E8=AF=B7=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=EF=BC=9B3=E3=80=81=E5=8A=9F=E8=83=BD=E5=88=80?= =?UTF-8?q?=E5=85=B7=E7=BB=84=E8=A3=85=E5=8D=95=E6=A8=A1=E5=9E=8B=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=A4=A7=E9=87=8F=E5=AD=97=E6=AE=B5=EF=BC=8C=E4=BC=98?= =?UTF-8?q?=E5=8C=96tree=E8=A7=86=E5=9B=BE=E5=92=8Cform=E8=A7=86=E5=9B=BE?= =?UTF-8?q?=E7=9A=84=E5=B8=83=E5=B1=80=EF=BC=9B4=E3=80=81=E7=BB=84?= =?UTF-8?q?=E8=A3=85=E5=8D=95=E5=BC=B9=E7=AA=97=E6=A8=A1=E5=9E=8B=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=A4=A7=E9=87=8F=E5=AD=97=E6=AE=B5=EF=BC=8C=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E7=A1=AE=E8=AE=A4=E7=BB=84=E8=A3=85=E6=8C=89=E9=94=AE?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_tool_management/models/base.py | 195 ++++--- sf_tool_management/views/tool_base_views.xml | 90 ++- sf_tool_management/wizard/wizard.py | 146 +++-- sf_tool_management/wizard/wizard_view.xml | 563 ++++++++++--------- 4 files changed, 568 insertions(+), 426 deletions(-) diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py index 4cbfbe06..1a7067cb 100644 --- a/sf_tool_management/models/base.py +++ b/sf_tool_management/models/base.py @@ -1,4 +1,6 @@ # -*- coding: utf-8 -*- +from datetime import timedelta + from odoo import fields, models, api from odoo import SUPERUSER_ID from odoo.exceptions import ValidationError @@ -14,13 +16,29 @@ class FunctionalCuttingToolEntity(models.Model): _description = '功能刀具列表' # 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) - 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_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', 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 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) @@ -175,7 +193,7 @@ class FunctionalToolWarning(models.Model): 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) machine_table_name_id = fields.Many2one('maintenance.equipment', string='机床名称', readonly=True, group_expand='_read_group_machine_table_name_ids') @@ -462,18 +480,18 @@ class MachineTableToolChangingApply(models.Model): tool_position_interface_type = fields.Selection( [('BT刀柄式', 'BT刀柄式'), ('SK刀柄式', 'SK刀柄式'), ('HSK刀柄式', 'HSK刀柄式'), ('CAT刀柄式', 'CAT刀柄式'), ('ISO刀盘式', 'ISO刀盘式'), ('DIN刀盘式', 'DIN刀盘式'), - ('直装固定式', '直装固定式')], string='刀位接口型号', requried=True) - 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) + ('直装固定式', '直装固定式')], string='刀位接口型号', required=True) + diameter = fields.Integer(string='刀具直径(mm)', ) + knife_tip_r_angle = fields.Float(string='刀尖R角(mm)') + max_lifetime_value = fields.Integer(string='最大寿命值(min)') + alarm_value = fields.Integer(string='报警值(min)') + used_value = fields.Integer(string='已使用值(min)') whether_standard_knife = fields.Boolean(string='是否标准刀', default=True) - extension_length = fields.Float(string='伸出长(mm)', requried=True) - effective_length = fields.Float(string='有效长(mm)', requried=True) + extension_length = fields.Float(string='伸出长(mm)') + effective_length = fields.Float(string='有效长(mm)') - functional_tool_status = fields.Selection([('正常', '正常'), ('报警', '报警')], string='功能刀具状态', - default='正常') + functional_tool_status = fields.Selection([('正常', '正常'), ('报警', '报警')], string='功能刀具状态', store=True, + default='正常', compute='_compute_functional_tool_status') assembly_order_code = 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) + @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') def _compute_machine_table_type_id(self): for record in self: @@ -511,54 +537,57 @@ class MachineTableToolChangingApply(models.Model): names = categories._search([], order=order, access_rights_uid=SUPERUSER_ID) return categories.browse(names) - @api.onchange('functional_tool_status') + @api.constrains('functional_tool_status') def automation_apply_for_tool_change(self): """ 自动申请换刀 :return: """ # 更新数据到机台换刀申请界面 - # todo 自动换刀申请条件需补充完善 - 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, - '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' - }) + if self.functional_tool_status == '报警' and self.sf_functional_tool_assembly_id == False: + machine_table_tool_changing_apply = 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) + ]) # 新建组装任务 - self.env['sf.functional.tool.assembly'].create({ - 'name': self.functional_tool_name_id, + sf_functional_tool_assembly = self.env['sf.functional.tool.assembly'].create({ + 'functional_tool_name': self.functional_tool_name, 'functional_tool_type_id': self.functional_tool_type_id.id, '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', - 'applicant': '自动申请', - 'reason_for_applying': '功能刀具状态异常', - 'use_tool_time': self.used_tool_time, - 'machine_tool_name': self.CNC_machine_table, - 'machine_tool_code': self.machine_tool_code, - 'cutter_spacing_code_id': self.cutter_spacing_code_id, + 'use_tool_time': fields.Datetime.now() + timedelta(hours=4), + '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': '机台报警自动换刀', + 'sf_machine_table_tool_changing_apply_id': self.id }) - 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 + machine_table_tool_changing_apply.write( + {'status': '1', + 'sf_functional_tool_assembly_id': sf_functional_tool_assembly}) - 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): """ @@ -567,22 +596,16 @@ class MachineTableToolChangingApply(models.Model): """ # 撤回功能刀具组装创建的任务 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() # 撤回数据更新 - self.env['sf.machine.table.tool.changing.apply'].search([('name', '=', self.name.id)]).write({ - 'replacement_tool_name_id': None, - 'replacement_tool_type_id': None, - 'replacement_tool_coarse_middle_thin': None, - 'new_former': None, - 'applicant': None, - 'used_tool_time': None, - 'reason_for_applying': None, - 'remark': None, - 'status': '0', - 'sf_functional_tool_assembly_id': None, - }) + 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)]).write( + {'status': '0', + 'sf_functional_tool_assembly_id': None + }) def revocation_2(self): """ @@ -590,9 +613,7 @@ class MachineTableToolChangingApply(models.Model): :return: """ self.env['sf.machine.table.tool.changing.apply'].search( - [('name', '=', self.name.id)]).write({ - 'status': '0' - }) + [('name', '=', self.name.id)]).write({'status': '0'}) class CAMWorkOrderProgramKnifePlan(models.Model): @@ -688,7 +709,12 @@ class FunctionalToolAssembly(models.Model): _description = '功能刀具组装单' _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) 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', '按库存组装')], 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_code = fields.Char(string='机台号', readonly=True) applicant = fields.Char(string='申请人', readonly=True) apply_time = fields.Datetime(string='申请时间', default=fields.Datetime.now(), readonly=True) - assemble_status = fields.Selection([('0', '待组装'), ('1', '已组装')], string='组装状态', - default='0', readonly=True) + assemble_status = fields.Selection([('0', '待组装'), ('1', '已组装')], string='组装状态', default='0', + readonly=True) cutter_spacing_code_id = fields.Many2one('maintenance.equipment.tool', string='刀位号', readonly=True) whether_standard_knife = fields.Boolean(string='是否标准刀', default=True, 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) after_assembly_functional_tool_name = fields.Char(string='组装后功能刀具名称', readonly=True) after_assembly_functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', - string='组装后功能刀具类型', readonly=True, - group_expand='_read_group_functional_tool_type_ids') - 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_new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧', readonly=True) - cut_time = fields.Char(string='已切削时间', readonly=True) - cut_length = fields.Char(string='已切削长度(mm)', readonly=True) - cut_number = fields.Char(string='已切削次数', readonly=True) + string='组装后功能刀具类型', 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_new_former = fields.Selection([('0', '新'), ('1', '旧')], string='组装后新/旧', readonly=True) + cut_time = fields.Integer(string='已切削时间(min)', readonly=True) + cut_length = fields.Float(string='已切削长度(mm)', readonly=True) + cut_number = fields.Integer(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', '精')], - string='粗/中/精', 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_used_value = fields.Integer(string='已使用值(min)', 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_effective_length = fields.Float(string='有效长(mm)', readonly=True) + string='组装后粗/中/精', 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_used_value = fields.Integer(string='组装后已使用值(min)', 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_effective_length = fields.Float(string='组装后有效长(mm)', readonly=True) L_D_number = fields.Float(string='L/D值(mm)', readonly=True) hiding_length = fields.Float(string='避空长(mm)', readonly=True) 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_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) check_box_1 = fields.Boolean(string='复选框', default=False, readonly=False) @@ -902,5 +924,4 @@ class FunctionalToolAssembly(models.Model): if obj.loading_task_source: code = self._get_code(obj.loading_task_source) obj.assembly_order_code = code - obj.name = code return obj diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml index 217400b9..b07fe225 100644 --- a/sf_tool_management/views/tool_base_views.xml +++ b/sf_tool_management/views/tool_base_views.xml @@ -765,7 +765,6 @@ 'default_replacement_knife_tip_r_angle': knife_tip_r_angle, 'default_replacement_max_lifetime_value': max_lifetime_value, 'default_replacement_alarm_value': alarm_value, - 'default_replacement_used_value': used_value, 'default_replacement_whether_standard_knife': whether_standard_knife, 'default_replacement_extension_length': extension_length, 'default_replacement_effective_length': effective_length, @@ -842,7 +841,6 @@ 'default_replacement_knife_tip_r_angle': knife_tip_r_angle, 'default_replacement_max_lifetime_value': max_lifetime_value, 'default_replacement_alarm_value': alarm_value, - 'default_replacement_used_value': used_value, 'default_replacement_whether_standard_knife': whether_standard_knife, 'default_replacement_extension_length': extension_length, 'default_replacement_effective_length': effective_length, @@ -880,6 +878,7 @@

+ @@ -1177,16 +1202,34 @@ - - - - - - + + + + + + + + + + + + + + + + + + @@ -1291,7 +1334,8 @@ - 、 + + @@ -1299,11 +1343,9 @@ - - diff --git a/sf_tool_management/wizard/wizard.py b/sf_tool_management/wizard/wizard.py index 053ba39a..3c17bf47 100644 --- a/sf_tool_management/wizard/wizard.py +++ b/sf_tool_management/wizard/wizard.py @@ -32,21 +32,21 @@ class ToolChangeRequirementInformation(models.TransientModel): 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_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_diameter = fields.Integer(string='待换刀具直径(mm)') + replacement_knife_tip_r_angle = fields.Float(string='待换刀具刀尖R角(mm)') + replacement_tool_setting_length = fields.Float(string='待换刀具装刀长(mm)') + replacement_extension_length = fields.Float(string='待换刀具伸出长(mm)') + replacement_effective_length = fields.Float(string='待换刀具有效长(mm)') replacement_tool_coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], 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) + replacement_max_lifetime_value = fields.Integer(string='待换刀具最大寿命值(min)') + replacement_alarm_value = fields.Integer(string='待换刀具报警值(min)') + replacement_used_value = fields.Integer(string='待换刀具已使用值(min)') 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='用刀时间', default=lambda self: fields.Datetime.now() + timedelta(hours=4)) 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(), 'cutter_spacing_code_id': self.cutter_spacing_code_id.id, '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) # 修改机床换刀申请状态 @@ -129,7 +130,7 @@ class ToolTransferRequestInformation(models.TransientModel): ('线边刀库', '线边刀库'), ('刀具房', '刀具房')], string='转移到:', default='线边刀库') 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_cutter_spacing_code = fields.Char(string='目标刀位号') @@ -153,21 +154,33 @@ class FunctionalToolAssemblyOrder(models.TransientModel): _inherit = ["barcodes.barcode_events_mixin"] _description = '功能刀具组装单' - # 功能刀具申请信息 - machine_tool_name_id = fields.Many2one('maintenance.equipment', 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, + 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) - cutter_spacing_code = fields.Char(string='刀位号', readonly=True) - # 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_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True) - functional_tool_length = fields.Char(string='功能刀具伸出长(mm)', readonly=True) - effective_length = fields.Char(string='有效长(mm)', readonly=True) - functional_tool_diameter = fields.Char(string='功能刀具直径(mm)', readonly=True) - tool_included_angle = fields.Char(string='刀尖角（R角）', readonly=True) - functional_tool_cutting_type = fields.Char(string='功能刀具切削类型', readonly=True) - required_cutting_time = fields.Char(string='需切削时长', readonly=True) - whether_standard_tool = fields.Boolean(string='是否标准刀', readonly=True) + applicant = fields.Char(string='申请人', readonly=True) + apply_time = fields.Datetime(string='申请时间', default=fields.Datetime.now(), readonly=True) + assemble_status = fields.Selection([('0', '待组装'), ('1', '已组装')], string='组装状态', default='0', + readonly=True) + cutter_spacing_code_id = fields.Many2one('maintenance.equipment.tool', string='刀位号', readonly=True) + whether_standard_knife = fields.Boolean(string='是否标准刀', default=True, readonly=True) + reason_for_applying = fields.Char(string='申请原因', 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) # 功能刀具组装信息 # 整体式刀具型号 @@ -294,13 +307,30 @@ class FunctionalToolAssemblyOrder(models.TransientModel): record.chuck_name = 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='装刀长') - new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧', required=True, default='0') - reference_length = fields.Char(string='参考伸出长') - cut_time = fields.Char(string='已切削时间') - cut_length = fields.Char(string='已切削长度') - cut_number = fields.Char(string='已切削次数') + # 组装功能刀具参数信息 + barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号') + after_assembly_functional_tool_name = fields.Char(string='组装后功能刀具名称', required=True) + after_assembly_functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', + string='组装后功能刀具类型') + after_assembly_functional_tool_diameter = fields.Integer(string='组装后功能刀具直径(mm)') + 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): """ @@ -319,26 +349,26 @@ class FunctionalToolAssemblyOrder(models.TransientModel): desc_1 = self.get_desc_1(stock_lot) functional_tool_assembly = self.env['sf.functional.tool.assembly'].search([ ('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'), ]) # 创建功能刀具列表记录 # 封装功能刀具数据 - desc_2 = self.get_desc_2(stock_lot) - # 创建功能刀具列表、功能刀具预警、功能刀具实时分布、功能刀具出入库记录 - record_1 = self.env['sf.functional.cutting.tool.entity'].create(desc_2) - self.env['sf.functional.tool.warning'].create({ - 'functional_cutting_tool_id': record_1.id, - 'functional_tool_assembly_id': functional_tool_assembly.id, - 'machine_table_name_id': self.machine_tool_name_id.id, - }) - self.env['sf.real.time.distribution.of.functional.tools'].create({ - 'functional_cutting_tool_id': record_1.id - }) - self.env['sf.inbound.and.outbound.records.of.functional.tools'].create({ - 'functional_cutting_tool_id': record_1.id - }) + # desc_2 = self.get_desc_2(stock_lot) + # # 创建功能刀具列表、功能刀具预警、功能刀具实时分布、功能刀具出入库记录 + # record_1 = self.env['sf.functional.cutting.tool.entity'].create(desc_2) + # self.env['sf.functional.tool.warning'].create({ + # 'functional_cutting_tool_id': record_1.id, + # 'functional_tool_assembly_id': functional_tool_assembly.id, + # 'machine_table_name_id': self.machine_tool_name_id.id, + # }) + # self.env['sf.real.time.distribution.of.functional.tools'].create({ + # 'functional_cutting_tool_id': record_1.id + # }) + # self.env['sf.inbound.and.outbound.records.of.functional.tools'].create({ + # 'functional_cutting_tool_id': record_1.id + # }) # 修改功能刀具组装单信息 functional_tool_assembly.write(desc_1) @@ -458,13 +488,25 @@ class FunctionalToolAssemblyOrder(models.TransientModel): 'pad_code_id': self.pad_code_id.id, 'handle_code_id': self.handle_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, - 'new_former': self.new_former, - 'reference_length': self.reference_length, + + 'after_assembly_functional_tool_name': self.after_assembly_functional_tool_name, + 'after_assembly_functional_tool_type_id': self.after_assembly_functional_tool_type_id.id, + '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_length': self.cut_length, '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', 'tool_loading_person': self.env.user.name, 'tool_loading_time': fields.Datetime.now() diff --git a/sf_tool_management/wizard/wizard_view.xml b/sf_tool_management/wizard/wizard_view.xml index caba3017..35db780f 100644 --- a/sf_tool_management/wizard/wizard_view.xml +++ b/sf_tool_management/wizard/wizard_view.xml @@ -1,67 +1,68 @@ - + - 换刀需求信息 - sf.tool.change.requirement.information - - - -
-

- -

-
+ 换刀需求信息 + sf.tool.change.requirement.information + + + +
+

+ +

+
+ - - - - - - - - - - - - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - -
-
- - + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ + @@ -74,63 +75,71 @@ - + - 刀具转移申请信息 - sf.tool.transfer.request.information - -
- -
-

- -

-
+ 刀具转移申请信息 + sf.tool.transfer.request.information + + + +
+

+ +

+
+ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - - - - - - - - - + + + + + + + - -
-
- - + + + + + + + + + + + + + + + + + + +
+
+
+ + @@ -143,187 +152,215 @@ - + - 功能刀具组装单 - sf.functional.tool.assembly.order - -
- - + 功能刀具组装单 + sf.functional.tool.assembly.order + + + +
+

+ +

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
- - - - - - + + + - - - - - - - + + + + + + + + + + - - - -
- -
+ +
+ +
+ - - - - - - - - - - - - - - + - -
- -
+ - - - + - - - - - - - - - - + + + + + - -
- -
+ + +
+ +
+ - - - - - - - - - - - - - - + - -
- -
+ - - - + - - - - - - - - - - + + + + + - -
- -
+ + +
+ +
+ - - - - - - - - - - - - - - + - -
- -
+ - - - + - - - - - - - - - - + + + + + - + + +
+ +
+ + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + - -
-
- - + + + + + + + + + + + + + +
+
+
+ + From 83da8f58e26e018df33a31d9b774fece9a5d8889 Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Wed, 22 Nov 2023 17:19:25 +0800 Subject: [PATCH 5/5] =?UTF-8?q?1=E3=80=81=E5=8A=9F=E8=83=BD=E5=88=80?= =?UTF-8?q?=E5=85=B7=E5=88=97=E8=A1=A8=E6=A8=A1=E5=9E=8B=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=A4=A7=E9=87=8F=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E5=BA=93=E5=AD=98=E6=95=B0=E9=87=8F=E6=96=B9?= =?UTF-8?q?=E6=B3=95=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=9F=A5=E7=9C=8B=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7=E7=9A=84=E9=A2=84?= =?UTF-8?q?=E8=AD=A6=E8=AE=B0=E5=BD=95=E6=8C=89=E9=94=AE=EF=BC=9B2?= =?UTF-8?q?=E3=80=81=E9=87=8D=E6=9E=84=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7?= =?UTF-8?q?=E9=A2=84=E8=AD=A6=E6=A8=A1=E5=9E=8B=EF=BC=88=E5=B7=B2=E5=AE=8C?= =?UTF-8?q?=E6=88=90=EF=BC=89=EF=BC=9B3=E3=80=81=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=88=80=E5=85=B7=E7=BB=84=E8=A3=85=E6=A8=A1=E5=9E=8Bname?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=B1=95=E7=A4=BA=E5=86=85=E5=AE=B9=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_tool_management/models/__init__.py | 1 - sf_tool_management/models/base.py | 339 +++++++------------ sf_tool_management/views/menu_view.xml | 31 +- sf_tool_management/views/tool_base_views.xml | 283 ++++++---------- sf_tool_management/wizard/__init__.py | 2 +- sf_tool_management/wizard/wizard.py | 47 ++- 6 files changed, 270 insertions(+), 433 deletions(-) diff --git a/sf_tool_management/models/__init__.py b/sf_tool_management/models/__init__.py index 67b36bda..3ab6007e 100644 --- a/sf_tool_management/models/__init__.py +++ b/sf_tool_management/models/__init__.py @@ -1,3 +1,2 @@ from . import base from . import tool_material_search - diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py index 1a7067cb..14f463a0 100644 --- a/sf_tool_management/models/base.py +++ b/sf_tool_management/models/base.py @@ -19,9 +19,9 @@ class FunctionalCuttingToolEntity(models.Model): 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) - 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='功能刀具类型', - group_expand='_read_group_mrs_cutting_tool_type_id', compute_sudo=True) + sf_cutting_tool_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀具型号') + sf_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', + 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) @@ -30,14 +30,27 @@ class FunctionalCuttingToolEntity(models.Model): 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='机内刀库数量') + tool_room_num = fields.Integer(string='刀具房数量', readonly=True, ) + line_edge_knife_library_num = fields.Integer(string='线边刀库数量', readonly=True) + machine_knife_library_num = fields.Integer(string='机内刀库数量', 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) functional_tool_status = fields.Selection([('正常', '正常'), ('报警', '报警'), ('已拆除', '已拆除')], string='状态', store=True, default='正常') + current_location_id = fields.Many2one('stock.location', string='当前位置', readonly=True) + image = fields.Binary('图片', readonly=True) + + @api.depends('current_location_id') + def _compute_location_num(self): + """ + 计算库存位置数量 + """ + for obj in self: + if obj.current_location_id.name in ('组装后', '刀具房'): + obj.tool_room_num = 1 + obj.line_edge_knife_library_num = 0 + obj.machine_knife_library_num = 0 @api.model def _read_group_mrs_cutting_tool_type_id(self, categories, domain, order): @@ -47,64 +60,44 @@ class FunctionalCuttingToolEntity(models.Model): # 整体式刀具型号 cutting_tool_integral_model_id = fields.Many2one('product.product', string='整体式刀具型号', readonly=True, domain=[('cutting_tool_material_id', '=', '整体式刀具')]) - # 刀片型号 cutting_tool_blade_model_id = fields.Many2one('product.product', string='刀片型号', readonly=True, domain=[('cutting_tool_material_id', '=', '刀片')]) - # 刀杆型号 cutting_tool_cutterbar_model_id = fields.Many2one('product.product', string='刀杆型号', readonly=True, domain=[('cutting_tool_material_id', '=', '刀杆')]) - # 刀盘型号 cutting_tool_cutterpad_model_id = fields.Many2one('product.product', string='刀盘型号', readonly=True, domain=[('cutting_tool_material_id', '=', '刀盘')]) - # 刀柄型号 cutting_tool_cutterhandle_model_id = fields.Many2one('product.product', string='刀柄型号', readonly=True, domain=[('cutting_tool_material_id', '=', '刀柄')]) - # 夹头型号 cutting_tool_cutterhead_model_id = fields.Many2one('product.product', string='夹头型号', readonly=True, domain=[('cutting_tool_material_id', '=', '夹头')]) - diameter = fields.Float('直径(mm)') - tool_grade = fields.Selection([('1', 'P1'), ('2', 'P2'), ('3', 'P3'), ('4', 'P4'), ('5', 'P5'), ('6', 'P6')], - string='刀具等级') - machining_accuracy = fields.Float('加工精度(mm)') - tool_length = fields.Float('装刀长(mm)') - blade_number = fields.Integer('刃数') - integral_blade_length = fields.Float('整体刃长(mm)') - effective_blade_length = fields.Float('有效刃长(mm)') - max_life = fields.Float('最大寿命值') - is_standard = fields.Selection([('1', '是'), ('0', '否')], '是否标准刀') - applicable_range = fields.Char('适用范围') - image = fields.Binary('图片') + whether_standard_knife = fields.Boolean(string='是否标准刀', default=True, readonly=True) + L_D_number = fields.Float(string='L/D值(mm)', readonly=True) + hiding_length = fields.Float(string='避空长(mm)', readonly=True) + cut_time = fields.Integer(string='已切削时间(min)', readonly=True) + cut_length = fields.Float(string='已切削长度(mm)', readonly=True) + cut_number = fields.Integer(string='已切削次数', readonly=True) - suitable_machining_method_ids = fields.Many2many('maintenance.equipment.image', - 'rel_machining_product_template_tool_entity', '适合加工方式', - domain=[('type', '=', '加工能力')], - related='cutting_tool_integral_model_id.suitable_machining_method_ids') - - blade_tip_characteristics_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') - - handle_type_ids = fields.Many2many('maintenance.equipment.image', - 'rel_handle_product_template_tool_entity', '柄部类型', - domain=[('type', '=', '柄部类型')], - related='cutting_tool_integral_model_id.handle_type_ids') - - cutting_direction_ids = fields.Many2many('maintenance.equipment.image', - 'rel_cutting_product_template_tool_entity', '走刀方向', - domain=[('type', '=', '走刀方向')], - related='cutting_tool_integral_model_id.cutting_direction_ids') - - suitable_coolant_ids = fields.Many2many('maintenance.equipment.image', - 'rel_coolant_product_template_tool_entity', '适合冷却液', - domain=[('type', '=', '冷却液')], - related='cutting_tool_integral_model_id.suitable_coolant_ids') + suitable_machining_method_ids = fields.Many2many( + 'maintenance.equipment.image', 'rel_machining_product_template_tool_entity', '适合加工方式', + domain=[('type', '=', '加工能力')], related='cutting_tool_integral_model_id.suitable_machining_method_ids') + blade_tip_characteristics_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') + handle_type_ids = fields.Many2many( + 'maintenance.equipment.image', 'rel_handle_product_template_tool_entity', '柄部类型', + domain=[('type', '=', '柄部类型')], related='cutting_tool_integral_model_id.handle_type_ids') + cutting_direction_ids = fields.Many2many( + 'maintenance.equipment.image', 'rel_cutting_product_template_tool_entity', '走刀方向', + domain=[('type', '=', '走刀方向')], related='cutting_tool_integral_model_id.cutting_direction_ids') + suitable_coolant_ids = fields.Many2many( + 'maintenance.equipment.image', 'rel_coolant_product_template_tool_entity', '适合冷却液', + domain=[('type', '=', '冷却液')], related='cutting_tool_integral_model_id.suitable_coolant_ids') def _get_functional_tool_model_ids(self, functional_tool_model_code): functional_tool_model_ids = [] @@ -114,112 +107,48 @@ class FunctionalCuttingToolEntity(models.Model): return [(6, 0, functional_tool_model_ids)] def open_functional_tool_warning(self): - pass + action = self.env.ref('sf_tool_management.action_sf_functional_tool_warning') + result = action.read()[0] + result['domain'] = [('functional_tool_name_id', '=', self.functional_tool_name_id.id)] + return result class FunctionalToolWarning(models.Model): _name = 'sf.functional.tool.warning' _description = '功能刀具预警' - functional_cutting_tool_id = fields.Many2one('sf.functional.cutting.tool.entity', '功能刀具', readonly=True) - functional_tool_assembly_id = fields.Many2one('sf.functional.tool.assembly', '功能刀具组装', readonly=True) - - # code = fields.Char('编码', readonly=True, related='functional_cutting_tool_id.code') - barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True, - related='functional_cutting_tool_id.barcode_id') - name = fields.Char('名称', invisible=True, readonly=True, related='functional_cutting_tool_id.name') - functional_tool_name_id = fields.Many2one('product.product', string='功能刀具名称', readonly=True, - related='functional_cutting_tool_id.functional_tool_name_id') - mrs_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True, - related='functional_cutting_tool_id.mrs_cutting_tool_type_id') - - # 整体式刀具型号 - cutting_tool_integral_model_id = fields.Many2one('product.product', string='整体式刀具型号', readonly=True, - domain=[('cutting_tool_material_id', '=', '整体式刀具')], - related='functional_cutting_tool_id.cutting_tool_integral_model_id') - - # 刀片型号 - cutting_tool_blade_model_id = fields.Many2one('product.product', string='刀片型号', readonly=True, - domain=[('cutting_tool_material_id', '=', '刀片')], - related='functional_cutting_tool_id.cutting_tool_blade_model_id') - - # 刀杆型号 - cutting_tool_cutterbar_model_id = fields.Many2one('product.product', string='刀杆型号', readonly=True, - domain=[('cutting_tool_material_id', '=', '刀杆')], - related='functional_cutting_tool_id.cutting_tool_cutterbar_model_id') - - # 刀盘型号 - cutting_tool_cutterpad_model_id = fields.Many2one('product.product', string='刀盘型号', readonly=True, - domain=[('cutting_tool_material_id', '=', '刀盘')], - related='functional_cutting_tool_id.cutting_tool_cutterpad_model_id') - - # 刀柄型号 - cutting_tool_cutterhandle_model_id = fields.Many2one('product.product', string='刀柄型号', readonly=True, - domain=[('cutting_tool_material_id', '=', '刀柄')], - related='functional_cutting_tool_id.cutting_tool_cutterhandle_model_id') - - # 夹头型号 - cutting_tool_cutterhead_model_id = fields.Many2one('product.product', string='夹头型号', readonly=True, - domain=[('cutting_tool_material_id', '=', '夹头')], - related='functional_cutting_tool_id.cutting_tool_cutterhead_model_id') - - diameter = fields.Float('直径(mm)', readonly=True, related='functional_cutting_tool_id.diameter') - tool_grade = fields.Selection([('1', 'P1'), ('2', 'P2'), ('3', 'P3'), ('4', 'P4'), ('5', 'P5'), ('6', 'P6')], - string='刀具等级', readonly=True, compute='_compute_functional_cutting_tool_id') - machining_accuracy = fields.Float('加工精度(mm)', readonly=True, - related='functional_cutting_tool_id.machining_accuracy') - - # tool_length = fields.Float('装刀长', readonly=True, related='functional_cutting_tool_id.tool_length') - - tool_length = fields.Float('装刀长(mm)', readonly=True, related='functional_cutting_tool_id.tool_length') - blade_number = fields.Integer('刃数', readonly=True, related='functional_cutting_tool_id.blade_number') - integral_blade_length = fields.Float('整体刃长(mm)', readonly=True, - related='functional_cutting_tool_id.integral_blade_length') - effective_blade_length = fields.Float('有效刃长(mm)', readonly=True, - related='functional_cutting_tool_id.effective_blade_length') - max_life = fields.Float('最大寿命值', readonly=True, related='functional_cutting_tool_id.max_life') - is_standard = fields.Selection([('1', '是'), ('0', '否')], '是否标准刀', readonly=True, - compute='_compute_functional_cutting_tool_id') - applicable_range = fields.Char('适用范围', readonly=True, related='functional_cutting_tool_id.applicable_range') - - image = fields.Binary('图片', readonly=True, related='functional_cutting_tool_id.image') - install_tool_time = fields.Datetime("装刀时间", readonly=True, - related='functional_tool_assembly_id.tool_loading_time') - - @api.depends('functional_cutting_tool_id') - def _compute_functional_cutting_tool_id(self): - if self.functional_cutting_tool_id: - self.tool_grade = self.functional_cutting_tool_id.tool_grade - self.is_standard = self.functional_cutting_tool_id.is_standard - - # 功能刀具预警 特有字段 - outbound_time = fields.Datetime('出库时间', readonly=True) - on_board_time = fields.Datetime('上机时间', readonly=False) - machine_table_name_id = fields.Many2one('maintenance.equipment', string='机床名称', readonly=True, - group_expand='_read_group_machine_table_name_ids') + name = fields.Char('名称', invisible=True, readonly=True, related='functional_tool_name_id.name') + # 机床信息 + production_line_id = fields.Many2one('sf.production.line', string='生产线', + group_expand='_read_group_machine_table_name_ids') + maintenance_equipment_id = fields.Many2one('maintenance.equipment', string='CNC机床') + machine_tool_code = fields.Char(string='机台号') + machine_table_type_id = fields.Many2one('maintenance.equipment.category', string='机床类型') + cutter_spacing_code_id = fields.Many2one('maintenance.equipment.tool', string='刀位号', + domain="[('equipment_id', '=', maintenance_equipment_id)]") + # 功能刀具信息 + functional_tool_name_id = fields.Many2one('sf.functional.tool.assembly', string='功能刀具名称') + barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', related='functional_tool_name_id.barcode_id') + mrs_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型') + diameter = fields.Integer(string='刀具直径(mm)') + knife_tip_r_angle = fields.Float(string='刀尖R角(mm)') + # 其他信息 + install_tool_time = fields.Datetime("刀具组装时间") + on_board_time = fields.Datetime('上机装刀时间') + max_lifetime_value = fields.Integer(string='最大寿命值(min)') + alarm_value = fields.Integer(string='报警值(min)') + used_value = fields.Integer(string='已使用值(min)') + functional_tool_status = fields.Selection([('正常', '正常'), ('报警', '报警'), ('已拆除', '已拆除')], string='状态') + alarm_time = fields.Char('报警时间') + dispose_user = fields.Char('处理人') + dispose_time = fields.Char('处理时间') + dispose_func = fields.Char('处理方法/措施', readonly=False) @api.model def _read_group_machine_table_name_ids(self, categories, domain, order): machine_table_name_ids = categories._search([], order=order, access_rights_uid=SUPERUSER_ID) 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) - # idle_time = fields.Char('闲置时长', readonly=False) - idle_time = fields.Char('闲置时长(h)', readonly=False) - alarm_value = fields.Char('报警值', readonly=False) - used_value = fields.Char('已使用值', readonly=False) - alarm_type = fields.Char('报警类型', readonly=False) - dispose_user = fields.Char('处理人', readonly=False) - alarm_time = fields.Char('报警时间', readonly=False) - dispose_time = fields.Char('处理时间', readonly=False) - dispose_func = fields.Char('处理方法/措施', readonly=False) - remark = fields.Char('备注', readonly=False) - - @api.onchange('functional_cutting_tool_id') - def onchange_functional_cutting_tool_id(self): - print(self.functional_cutting_tool_id.name) - class RealTimeDistributionOfFunctionalTools(models.Model): _name = 'sf.real.time.distribution.of.functional.tools' @@ -243,60 +172,61 @@ class RealTimeDistributionOfFunctionalTools(models.Model): record.mrs_cutting_tool_type_id = record.functional_cutting_tool_id.mrs_cutting_tool_type_id.id # code = fields.Char('编码', readonly=True, related='functional_cutting_tool_id.code') - barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True, - related='functional_cutting_tool_id.barcode_id') - name = fields.Char('名称', invisible=True, readonly=True, related='functional_cutting_tool_id.name') - functional_tool_name_id = fields.Many2one('product.product', string='功能刀具名称', readonly=True, - related='functional_cutting_tool_id.functional_tool_name_id') + barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True) + name = fields.Char('名称', invisible=True, readonly=True) + functional_tool_name_id = fields.Many2one('product.product', string='功能刀具名称', readonly=True) # mrs_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True, # related='functional_cutting_tool_id.mrs_cutting_tool_type_id') # 整体式刀具型号 - cutting_tool_integral_model_id = fields.Many2one('product.product', string='整体式刀具型号', readonly=True, - domain=[('cutting_tool_material_id', '=', '整体式刀具')], - related='functional_cutting_tool_id.cutting_tool_integral_model_id') + cutting_tool_integral_model_id = fields.Many2one( + 'product.product', string='整体式刀具型号', readonly=True, + domain=[('cutting_tool_material_id', '=', '整体式刀具')], + related='functional_cutting_tool_id.cutting_tool_integral_model_id') # 刀片型号 - cutting_tool_blade_model_id = fields.Many2one('product.product', string='刀片型号', readonly=True, - domain=[('cutting_tool_material_id', '=', '刀片')], - related='functional_cutting_tool_id.cutting_tool_blade_model_id') + cutting_tool_blade_model_id = fields.Many2one( + 'product.product', string='刀片型号', readonly=True, + domain=[('cutting_tool_material_id', '=', '刀片')], + related='functional_cutting_tool_id.cutting_tool_blade_model_id') # 刀杆型号 - cutting_tool_cutterbar_model_id = fields.Many2one('product.product', string='刀杆型号', readonly=True, - domain=[('cutting_tool_material_id', '=', '刀杆')], - related='functional_cutting_tool_id.cutting_tool_cutterbar_model_id') + cutting_tool_cutterbar_model_id = fields.Many2one( + 'product.product', string='刀杆型号', readonly=True, + domain=[('cutting_tool_material_id', '=', '刀杆')], + related='functional_cutting_tool_id.cutting_tool_cutterbar_model_id') # 刀盘型号 - cutting_tool_cutterpad_model_id = fields.Many2one('product.product', string='刀盘型号', readonly=True, - domain=[('cutting_tool_material_id', '=', '刀盘')], - related='functional_cutting_tool_id.cutting_tool_cutterpad_model_id') + cutting_tool_cutterpad_model_id = fields.Many2one( + 'product.product', string='刀盘型号', readonly=True, + domain=[('cutting_tool_material_id', '=', '刀盘')], + related='functional_cutting_tool_id.cutting_tool_cutterpad_model_id') # 刀柄型号 - cutting_tool_cutterhandle_model_id = fields.Many2one('product.product', string='刀柄型号', readonly=True, - domain=[('cutting_tool_material_id', '=', '刀柄')], - related='functional_cutting_tool_id.cutting_tool_cutterhandle_model_id') + cutting_tool_cutterhandle_model_id = fields.Many2one( + 'product.product', string='刀柄型号', readonly=True, + domain=[('cutting_tool_material_id', '=', '刀柄')], + related='functional_cutting_tool_id.cutting_tool_cutterhandle_model_id') # 夹头型号 - cutting_tool_cutterhead_model_id = fields.Many2one('product.product', string='夹头型号', readonly=True, - domain=[('cutting_tool_material_id', '=', '夹头')], - related='functional_cutting_tool_id.cutting_tool_cutterhead_model_id') + cutting_tool_cutterhead_model_id = fields.Many2one( + 'product.product', string='夹头型号', readonly=True, + domain=[('cutting_tool_material_id', '=', '夹头')], + related='functional_cutting_tool_id.cutting_tool_cutterhead_model_id') - diameter = fields.Float('直径(mm)', readonly=True, related='functional_cutting_tool_id.diameter') + diameter = fields.Float('直径(mm)', readonly=True) tool_grade = fields.Selection([('1', 'P1'), ('2', 'P2'), ('3', 'P3'), ('4', 'P4'), ('5', 'P5'), ('6', 'P6')], - string='刀具等级', readonly=True, compute='_compute_functional_cutting_tool_id') - machining_accuracy = fields.Float('加工精度(mm)', readonly=True, - related='functional_cutting_tool_id.machining_accuracy') - tool_length = fields.Float('装刀长(mm)', readonly=True, related='functional_cutting_tool_id.tool_length') - blade_number = fields.Integer('刃数', readonly=True, related='functional_cutting_tool_id.blade_number') - integral_blade_length = fields.Float('整体刃长(mm)', readonly=True, - related='functional_cutting_tool_id.integral_blade_length') - effective_blade_length = fields.Float('有效刃长(mm)', readonly=True, - related='functional_cutting_tool_id.effective_blade_length') - max_life = fields.Float('最大寿命值', readonly=True, related='functional_cutting_tool_id.max_life') + string='刀具等级', readonly=True) + machining_accuracy = fields.Float('加工精度(mm)', readonly=True) + tool_length = fields.Float('装刀长(mm)', readonly=True) + blade_number = fields.Integer('刃数', readonly=True) + integral_blade_length = fields.Float('整体刃长(mm)', readonly=True) + effective_blade_length = fields.Float('有效刃长(mm)', readonly=True) + max_life = fields.Float('最大寿命值', readonly=True) is_standard = fields.Selection([('1', '是'), ('0', '否')], '是否标准刀', readonly=True, compute='_compute_functional_cutting_tool_id') - applicable_range = fields.Char('适用范围', readonly=True, related='functional_cutting_tool_id.applicable_range') - image = fields.Binary('图片', readonly=True, related='functional_cutting_tool_id.image') + applicable_range = fields.Char('适用范围', readonly=True) + image = fields.Binary('图片', readonly=True) @api.depends('functional_cutting_tool_id') def _compute_functional_cutting_tool_id(self): @@ -326,7 +256,8 @@ class RealTimeDistributionOfFunctionalTools(models.Model): def _compute_return_total(self): for record in self: if record: - self.return_total = record.return_reuse_num_re + record.return_reuse_num_co + record.return_processing_num + self.return_total = (record.return_reuse_num_re + record.return_reuse_num_co + + record.return_processing_num) @api.depends('tool_stock_total', 'return_total') def _compute_total(self): @@ -357,58 +288,47 @@ class InboundAndOutboundRecordsOfFunctionalTools(models.Model): record.mrs_cutting_tool_type_id = record.functional_cutting_tool_id.mrs_cutting_tool_type_id.id # code = fields.Char('编码', readonly=True, related='functional_cutting_tool_id.code') - barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True, - related='functional_cutting_tool_id.barcode_id') - name = fields.Char('名称', invisible=True, readonly=True, related='functional_cutting_tool_id.name') - functional_tool_name_id = fields.Many2one('product.product', string='功能刀具名称', readonly=True, - related='functional_cutting_tool_id.functional_tool_name_id') + barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True) + name = fields.Char('名称', invisible=True, readonly=True) + functional_tool_name_id = fields.Many2one('product.product', string='功能刀具名称', readonly=True) # 整体式刀具型号 cutting_tool_integral_model_id = fields.Many2one('product.product', string='整体式刀具型号', readonly=True, - domain=[('cutting_tool_material_id', '=', '整体式刀具')], - related='functional_cutting_tool_id.cutting_tool_integral_model_id') + domain=[('cutting_tool_material_id', '=', '整体式刀具')]) # 刀片型号 cutting_tool_blade_model_id = fields.Many2one('product.product', string='刀片型号', readonly=True, - domain=[('cutting_tool_material_id', '=', '刀片')], - related='functional_cutting_tool_id.cutting_tool_blade_model_id') + domain=[('cutting_tool_material_id', '=', '刀片')]) # 刀杆型号 cutting_tool_cutterbar_model_id = fields.Many2one('product.product', string='刀杆型号', readonly=True, - domain=[('cutting_tool_material_id', '=', '刀杆')], - related='functional_cutting_tool_id.cutting_tool_cutterbar_model_id') + domain=[('cutting_tool_material_id', '=', '刀杆')]) # 刀盘型号 cutting_tool_cutterpad_model_id = fields.Many2one('product.product', string='刀盘型号', readonly=True, - domain=[('cutting_tool_material_id', '=', '刀盘')], - related='functional_cutting_tool_id.cutting_tool_cutterpad_model_id') + domain=[('cutting_tool_material_id', '=', '刀盘')]) # 刀柄型号 cutting_tool_cutterhandle_model_id = fields.Many2one('product.product', string='刀柄型号', readonly=True, - domain=[('cutting_tool_material_id', '=', '刀柄')], - related='functional_cutting_tool_id.cutting_tool_cutterhandle_model_id') + domain=[('cutting_tool_material_id', '=', '刀柄')]) # 夹头型号 cutting_tool_cutterhead_model_id = fields.Many2one('product.product', string='夹头型号', readonly=True, - domain=[('cutting_tool_material_id', '=', '夹头')], - related='functional_cutting_tool_id.cutting_tool_cutterhead_model_id') + domain=[('cutting_tool_material_id', '=', '夹头')]) - diameter = fields.Float('直径(mm)', readonly=True, related='functional_cutting_tool_id.diameter') + diameter = fields.Float('直径(mm)', readonly=True) tool_grade = fields.Selection([('1', 'P1'), ('2', 'P2'), ('3', 'P3'), ('4', 'P4'), ('5', 'P5'), ('6', 'P6')], string='刀具等级', readonly=True, compute='_compute_functional_cutting_tool_id') - machining_accuracy = fields.Float('加工精度(mm)', readonly=True, - related='functional_cutting_tool_id.machining_accuracy') - tool_length = fields.Float('装刀长(mm)', readonly=True, related='functional_cutting_tool_id.tool_length') - blade_number = fields.Integer('刃数', readonly=True, related='functional_cutting_tool_id.blade_number') - integral_blade_length = fields.Float('整体刃长(mm)', readonly=True, - related='functional_cutting_tool_id.integral_blade_length') - effective_blade_length = fields.Float('有效刃长(mm)', readonly=True, - related='functional_cutting_tool_id.effective_blade_length') - max_life = fields.Float('最大寿命值', readonly=True, related='functional_cutting_tool_id.max_life') + machining_accuracy = fields.Float('加工精度(mm)', readonly=True) + tool_length = fields.Float('装刀长(mm)', readonly=True) + blade_number = fields.Integer('刃数', readonly=True) + integral_blade_length = fields.Float('整体刃长(mm)', readonly=True) + effective_blade_length = fields.Float('有效刃长(mm)', readonly=True) + max_life = fields.Float('最大寿命值', readonly=True) is_standard = fields.Selection([('1', '是'), ('0', '否')], '是否标准刀', readonly=True, compute='_compute_functional_cutting_tool_id') - applicable_range = fields.Char('适用范围', readonly=True, related='functional_cutting_tool_id.applicable_range') - image = fields.Binary('图片', readonly=True, related='functional_cutting_tool_id.image') + applicable_range = fields.Char('适用范围', readonly=True) + image = fields.Binary('图片', readonly=True) @api.depends('functional_cutting_tool_id') def _compute_functional_cutting_tool_id(self): @@ -469,8 +389,7 @@ class MachineTableToolChangingApply(models.Model): compute='_compute_machine_table_type_id') machine_tool_code = fields.Char(string='机台号', store=True, invisible=True, readonly=True) cutter_spacing_code_id = fields.Many2one('maintenance.equipment.tool', string='刀位号', readonly=False, - required=True, - domain="[('equipment_id', '=', name)]") + required=True, domain="[('equipment_id', '=', maintenance_equipment_id)]") barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', domain=[('product_id.name', '=', '功能刀具')]) functional_tool_name = fields.Char(string='功能刀具名称') @@ -712,7 +631,7 @@ class FunctionalToolAssembly(models.Model): @api.depends('functional_tool_name') def _compute_name(self): for obj in self: - obj.name = obj.functional_tool_name + obj.name = obj.after_assembly_functional_tool_name name = fields.Char(string='名称', readonly=True, compute='_compute_name') assembly_order_code = fields.Char(string='编码', readonly=True) diff --git a/sf_tool_management/views/menu_view.xml b/sf_tool_management/views/menu_view.xml index 5b1ed7e9..efa4feee 100644 --- a/sf_tool_management/views/menu_view.xml +++ b/sf_tool_management/views/menu_view.xml @@ -13,7 +13,7 @@ name="功能刀具列表" sequence="4" action="sf_function_tool_entry_list_view_act" - /> + /> + /> + /> - - - - - - - + + /> + /> + /> - + /> - \ No newline at end of file + diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml index b07fe225..1cac4820 100644 --- a/sf_tool_management/views/tool_base_views.xml +++ b/sf_tool_management/views/tool_base_views.xml @@ -9,14 +9,24 @@ - - - - - - - + + + + + + + + + + + + + + + + + @@ -26,6 +36,9 @@ sf.functional.cutting.tool.entity
+
+ +
@@ -50,7 +63,7 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - - - - + + + + + + + + @@ -167,15 +155,28 @@ - - - - - - - + + + + + + + + + + + + + + + + + + - + + + @@ -194,148 +195,54 @@ sf.functional.tool.warning.tree sf.functional.tool.warning - + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - sf.functional.tool.warning.form - sf.functional.tool.warning - - - -
-

- -

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - sf.functional.tool.warning.search sf.functional.tool.warning + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - + + @@ -345,7 +252,7 @@ 功能刀具预警 ir.actions.act_window sf.functional.tool.warning - tree,form,search + tree,search @@ -1114,6 +1021,7 @@ name="%(sf_tool_management.sf_functional_tool_assembly_order_act)d" type="action" context="{'default_name':name, + 'default_assembly_order_code':assembly_order_code, '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, @@ -1150,6 +1058,7 @@ name="%(sf_tool_management.sf_functional_tool_assembly_order_act)d" type="action" context="{'default_name':name, + 'default_assembly_order_code':assembly_order_code, '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, diff --git a/sf_tool_management/wizard/__init__.py b/sf_tool_management/wizard/__init__.py index 20a7f5c4..40272379 100644 --- a/sf_tool_management/wizard/__init__.py +++ b/sf_tool_management/wizard/__init__.py @@ -1 +1 @@ -from . import wizard \ No newline at end of file +from . import wizard diff --git a/sf_tool_management/wizard/wizard.py b/sf_tool_management/wizard/wizard.py index 3c17bf47..990addf1 100644 --- a/sf_tool_management/wizard/wizard.py +++ b/sf_tool_management/wizard/wizard.py @@ -154,6 +154,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel): _inherit = ["barcodes.barcode_events_mixin"] _description = '功能刀具组装单' + assembly_order_code = fields.Char(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, @@ -320,7 +321,8 @@ class FunctionalToolAssemblyOrder(models.TransientModel): 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_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)') @@ -348,6 +350,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel): # 封装功能刀具数据 desc_1 = self.get_desc_1(stock_lot) functional_tool_assembly = self.env['sf.functional.tool.assembly'].search([ + ('assembly_order_code', '=', self.assembly_order_code), ('machine_tool_name_id', '=', self.machine_tool_name_id.id), ('cutter_spacing_code_id', '=', self.cutter_spacing_code_id.id), ('assemble_status', '=', '0'), @@ -355,9 +358,9 @@ class FunctionalToolAssemblyOrder(models.TransientModel): # 创建功能刀具列表记录 # 封装功能刀具数据 - # desc_2 = self.get_desc_2(stock_lot) - # # 创建功能刀具列表、功能刀具预警、功能刀具实时分布、功能刀具出入库记录 - # record_1 = self.env['sf.functional.cutting.tool.entity'].create(desc_2) + desc_2 = self.get_desc_2(stock_lot, functional_tool_assembly) + # 创建功能刀具列表、功能刀具预警、功能刀具实时分布、功能刀具出入库记录 + record_1 = self.env['sf.functional.cutting.tool.entity'].create(desc_2) # self.env['sf.functional.tool.warning'].create({ # 'functional_cutting_tool_id': record_1.id, # 'functional_tool_assembly_id': functional_tool_assembly.id, @@ -512,26 +515,34 @@ class FunctionalToolAssemblyOrder(models.TransientModel): 'tool_loading_time': fields.Datetime.now() } - def get_desc_2(self, stock_lot): + def get_desc_2(self, stock_lot, functional_tool_assembly_id): return { 'barcode_id': stock_lot.id, - 'functional_tool_name_id': self.functional_tool_name_id.id, - 'mrs_cutting_tool_type_id': self.functional_tool_type_id.id, + 'functional_tool_name_id': functional_tool_assembly_id.id, + 'sf_cutting_tool_type_id': self.after_assembly_functional_tool_type_id.id, 'cutting_tool_integral_model_id': self.integral_code_id.product_id.id, 'cutting_tool_blade_model_id': self.blade_code_id.product_id.id, 'cutting_tool_cutterbar_model_id': self.bar_code_id.product_id.id, 'cutting_tool_cutterpad_model_id': self.pad_code_id.product_id.id, 'cutting_tool_cutterhandle_model_id': self.handle_code_id.product_id.id, 'cutting_tool_cutterhead_model_id': self.chuck_code_id.product_id.id, - 'diameter': self.functional_tool_diameter, - 'tool_grade': None, - 'machining_accuracy': None, - 'tool_length': self.tool_loading_length, - 'blade_number': None, - 'integral_blade_length': None, - 'effective_blade_length': self.effective_length, - 'max_life': None, - 'is_standard': self.whether_standard_tool, - 'applicable_range': None, - 'image': None, + + 'functional_tool_diameter': self.after_assembly_functional_tool_diameter, + 'knife_tip_r_angle': self.after_assembly_knife_tip_r_angle, + 'coarse_middle_thin': self.after_assembly_coarse_middle_thin, + 'new_former': self.after_assembly_new_former, + 'tool_loading_length': self.after_assembly_tool_loading_length, + 'functional_tool_length': self.after_assembly_functional_tool_length, + 'effective_length': self.after_assembly_effective_length, + + 'max_lifetime_value': self.after_assembly_max_lifetime_value, + 'alarm_value': self.after_assembly_alarm_value, + 'used_value': self.after_assembly_used_value, + 'whether_standard_knife': self.after_assembly_whether_standard_knife, + 'L_D_number': self.L_D_number, + 'hiding_length': self.hiding_length, + 'cut_time': self.cut_time, + 'cut_length': self.cut_length, + 'cut_number': self.cut_number, + 'current_location_id': stock_lot.quant_ids.location_id.ids[-1], }