diff --git a/sf_manufacturing/static/src/js/kanban_change.js b/sf_manufacturing/static/src/js/kanban_change.js index b4f35051..fa692886 100644 --- a/sf_manufacturing/static/src/js/kanban_change.js +++ b/sf_manufacturing/static/src/js/kanban_change.js @@ -1,8 +1,8 @@ /** @odoo-module */ -import { KanbanController } from "@web/views/kanban/kanban_controller"; -import { kanbanView } from "@web/views/kanban/kanban_view"; -import { registry } from "@web/core/registry"; +import {KanbanController} from "@web/views/kanban/kanban_controller"; +import {kanbanView} from "@web/views/kanban/kanban_view"; +import {registry} from "@web/core/registry"; // the controller usually contains the Layout and the renderer. class CustomKanbanController extends KanbanController { @@ -14,7 +14,13 @@ class CustomKanbanController extends KanbanController { console.log('99999999111'); this.workOrders = await this.getAllWorkOrders(); console.log('lines', this.workOrders); -} + var aDiv = document.getElementsByClassName('o_kanban_record') + // for (var i = 0; i < aDiv.length; i++) { + // console.log(aDiv[i]) + // } + console.log(aDiv) + } + buttonClick(ev) { const button = ev.currentTarget; const id = button.getAttribute('data-id'); @@ -37,23 +43,23 @@ class CustomKanbanController extends KanbanController { kwargs: {} }).then((response) => { console.log('response', response); - setTimeout(function () { - location.reload(); - },2000) + location.reload(); + window.onload = function () { + button.classList.add('choose') + } }); }); - - } - async getAllWorkOrders() { - const response = await this.env.services.rpc('/web/dataset/call_kw',{ + + async getAllWorkOrders() { + const response = await this.env.services.rpc('/web/dataset/call_kw', { model: 'sf.production.line', method: 'search_read', args: [], kwargs: {}, }); // const response1 = await this.env.services.rpc('/web/dataset/call_kw',{ - // model: 'mrp.workcenter', + // model: 'mrp.workcenter', // method: 'search_read', // args: [], // kwargs: {}, diff --git a/sf_manufacturing/static/src/scss/kanban_change.scss b/sf_manufacturing/static/src/scss/kanban_change.scss index 97f610e1..f77895ab 100644 --- a/sf_manufacturing/static/src/scss/kanban_change.scss +++ b/sf_manufacturing/static/src/scss/kanban_change.scss @@ -16,7 +16,12 @@ font-weight: bold; } -.o_content > .d-flex { - display: block !important; -} +//.o_content > .d-flex { +// display: block !important; +//} + + + + + diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py index 2abcc2e7..2bf0df54 100644 --- a/sf_tool_management/models/base.py +++ b/sf_tool_management/models/base.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- from odoo import fields, models, api +from odoo import SUPERUSER_ID # class FunctionalCuttingToolEntity(models.Model): @@ -125,68 +126,84 @@ class FunctionalToolWarning(models.Model): _name = 'sf.functional.tool.warning' _description = '功能刀具预警' - functional_cutting_tool_id = fields.Many2one('sf.functional.cutting.tool.entity', '功能刀具', readonly=True) - code = fields.Char('编码', readonly=True) - name = fields.Char('名称', invisible=True, readonly=True) - mrs_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True) + 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') + name = fields.Char('名称', invisible=True, readonly=True, related='functional_cutting_tool_id.name') + 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') # 整体式刀具型号 mrs_cutting_tool_integral_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_warning_id', - string='整体式刀具型号', readonly=True, domain= - [('mrs_cutting_tool_material_name', '=', '整体式刀具')]) + string='整体式刀具型号', readonly=True, + domain= [('mrs_cutting_tool_material_name', '=', '整体式刀具')], + related='functional_cutting_tool_id.mrs_cutting_tool_integral_model_ids') # 刀片型号 mrs_cutting_tool_blade_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_warning_id', - string='刀片型号', readonly=True, domain= - [('mrs_cutting_tool_material_name', '=', '刀片')]) + string='刀片型号', readonly=True, + domain= [('mrs_cutting_tool_material_name', '=', '刀片')], + related='functional_cutting_tool_id.mrs_cutting_tool_blade_model_ids') # 刀杆型号 mrs_cutting_tool_cutterbar_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_warning_id', - string='刀杆型号', readonly=True, domain= - [('mrs_cutting_tool_material_name', '=', '刀杆')]) + string='刀杆型号', readonly=True, + domain= [('mrs_cutting_tool_material_name', '=', '刀杆')], + related='functional_cutting_tool_id.mrs_cutting_tool_cutterbar_model_ids') # 刀盘型号 mrs_cutting_tool_cutterpad_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_warning_id', - string='刀盘型号', readonly=True, domain= - [('mrs_cutting_tool_material_name', '=', '刀盘')]) + string='刀盘型号', readonly=True, + domain=[('mrs_cutting_tool_material_name', '=', '刀盘')], + related='functional_cutting_tool_id.mrs_cutting_tool_cutterpad_model_ids') # 刀柄型号 mrs_cutting_tool_cutterhandle_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_warning_id', - string='刀柄型号', readonly=True, domain= - [('mrs_cutting_tool_material_name', '=', '刀柄')]) + string='刀柄型号', readonly=True, + domain=[('mrs_cutting_tool_material_name', '=', '刀柄')], + related='functional_cutting_tool_id.mrs_cutting_tool_cutterhandle_model_ids') # 夹头型号 mrs_cutting_tool_cutterhead_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_warning_id', - string='夹头型号', readonly=True, domain= - [('mrs_cutting_tool_material_name', '=', '夹头')]) + string='夹头型号', readonly=True, + domain=[('mrs_cutting_tool_material_name', '=', '夹头')], + related='functional_cutting_tool_id.mrs_cutting_tool_cutterhead_model_ids') - diameter = fields.Float('直径(mm)', readonly=True) + 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) - machining_accuracy = fields.Float('加工精度(mm)', readonly=True) - tool_length = fields.Float('装刀长', 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.Boolean('是否标准刀', readonly=True) - applicable_range = fields.Char('适用范围', readonly=True) - image = fields.Binary('图片', readonly=True) + string='刀具等级', readonly=True, related='functional_cutting_tool_id.tool_grade') + machining_accuracy = fields.Float('加工精度(mm)', readonly=True, related='functional_cutting_tool_id.machining_accuracy') + tool_length = fields.Float('装刀长', readonly=True, related='functional_cutting_tool_id.tool_length') + blade_number = fields.Integer('刃数', readonly=True, related='functional_cutting_tool_id.blade_number') + integral_blade_length = fields.Float('整体刃长(mm)', readonly=True, related='functional_cutting_tool_id.integral_blade_length') + effective_blade_length = fields.Float('有效刃长(mm)', readonly=True, related='functional_cutting_tool_id.effective_blade_length') + max_life = fields.Float('最大寿命值', readonly=True, related='functional_cutting_tool_id.max_life') + is_standard = fields.Boolean('是否标准刀', readonly=True, related='functional_cutting_tool_id.is_standard') + 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.Char("装刀时间", readonly=False) - outbound_time = fields.Char('出库时间', readonly=False) - on_board_time = fields.Char('上机时间', readonly=False) - machine_tool_code = fields.Char('机台号', readonly=False) - cutting_tool_code = fields.Char('刀位号', readonly=False) + install_tool_time = fields.Datetime("装刀时间", readonly=True,related='functional_tool_assembly_id.tool_loading_time') + outbound_time = fields.Datetime('出库时间', readonly=True,related='functional_tool_assembly_id.receive_time') + on_board_time = fields.Datetime('上机时间', readonly=False) + machine_table_name_id = fields.Many2one('maintenance.equipment', string='机床名称', readonly=True, tracking=True, + group_expand='_read_group_machine_table_name_ids') + @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,related='functional_tool_assembly_id.cutter_spacing_code') idle_time = fields.Char('闲置时长', readonly=False) alarm_value = fields.Char('报警值', readonly=False) used_value = fields.Char('已使用值', readonly=False) alarm_type = fields.Char('报警类型', readonly=False) - alarm_time = 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) @@ -201,119 +218,189 @@ class RealTimeDistributionOfFunctionalTools(models.Model): _description = '功能刀具实时分布' functional_cutting_tool_id = fields.Many2one('sf.functional.cutting.tool.entity', '功能刀具', readonly=True) - code = fields.Char('编码', readonly=True) - name = fields.Char('名称', invisible=True, readonly=True) - mrs_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True) + mrs_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True, + tracking=True, group_expand='_read_mrs_cutting_tool_type_ids',store=True, + compute='_compute_functional_cutting_tool_id') + + @api.model + def _read_mrs_cutting_tool_type_ids(self, categories, domain, order): + mrs_cutting_tool_type_ids = categories._search([], order=order, access_rights_uid=SUPERUSER_ID) + return categories.browse(mrs_cutting_tool_type_ids) + + @api.depends('functional_cutting_tool_id') + def _compute_functional_cutting_tool_id(self): + for record in self: + if record: + 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') + name = fields.Char('名称', invisible=True, readonly=True, related='functional_cutting_tool_id.name') + # 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') # 整体式刀具型号 mrs_cutting_tool_integral_model_ids = fields.Many2many('sf.cutting.tool.model', - 'sf_real_time_distribution_of_functional_tools_id', - string='整体式刀具型号', readonly=True, domain= - [('mrs_cutting_tool_material_name', '=', '整体式刀具')]) + 'sf_functional_tool_warning_id', + string='整体式刀具型号', readonly=True, + domain=[ + ('mrs_cutting_tool_material_name', '=', '整体式刀具')], + related='functional_cutting_tool_id.mrs_cutting_tool_integral_model_ids') # 刀片型号 mrs_cutting_tool_blade_model_ids = fields.Many2many('sf.cutting.tool.model', - 'sf_real_time_distribution_of_functional_tools_id', - string='刀片型号', readonly=True, domain= - [('mrs_cutting_tool_material_name', '=', '刀片')]) + 'sf_functional_tool_warning_id', + string='刀片型号', readonly=True, + domain=[('mrs_cutting_tool_material_name', '=', '刀片')], + related='functional_cutting_tool_id.mrs_cutting_tool_blade_model_ids') # 刀杆型号 mrs_cutting_tool_cutterbar_model_ids = fields.Many2many('sf.cutting.tool.model', - 'sf_real_time_distribution_of_functional_tools_id', - string='刀杆型号', readonly=True, domain= - [('mrs_cutting_tool_material_name', '=', '刀杆')]) + 'sf_functional_tool_warning_id', + string='刀杆型号', readonly=True, + domain=[('mrs_cutting_tool_material_name', '=', '刀杆')], + related='functional_cutting_tool_id.mrs_cutting_tool_cutterbar_model_ids') # 刀盘型号 mrs_cutting_tool_cutterpad_model_ids = fields.Many2many('sf.cutting.tool.model', - 'sf_real_time_distribution_of_functional_tools_id', - string='刀盘型号', readonly=True, domain= - [('mrs_cutting_tool_material_name', '=', '刀盘')]) + 'sf_functional_tool_warning_id', + string='刀盘型号', readonly=True, + domain=[('mrs_cutting_tool_material_name', '=', '刀盘')], + related='functional_cutting_tool_id.mrs_cutting_tool_cutterpad_model_ids') # 刀柄型号 mrs_cutting_tool_cutterhandle_model_ids = fields.Many2many('sf.cutting.tool.model', - 'sf_real_time_distribution_of_functional_tools_id', - string='刀柄型号', readonly=True, domain= - [('mrs_cutting_tool_material_name', '=', '刀柄')]) + 'sf_functional_tool_warning_id', + string='刀柄型号', readonly=True, + domain=[('mrs_cutting_tool_material_name', '=', '刀柄')], + related='functional_cutting_tool_id.mrs_cutting_tool_cutterhandle_model_ids') # 夹头型号 mrs_cutting_tool_cutterhead_model_ids = fields.Many2many('sf.cutting.tool.model', - 'sf_real_time_distribution_of_functional_tools_id', - string='夹头型号', readonly=True, domain= - [('mrs_cutting_tool_material_name', '=', '夹头')]) + 'sf_functional_tool_warning_id', + string='夹头型号', readonly=True, + domain=[('mrs_cutting_tool_material_name', '=', '夹头')], + related='functional_cutting_tool_id.mrs_cutting_tool_cutterhead_model_ids') - diameter = fields.Float('直径(mm)', readonly=True) + 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) - machining_accuracy = fields.Float('加工精度(mm)', readonly=True) - tool_length = fields.Float('装刀长', 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.Boolean('是否标准刀', readonly=True) - applicable_range = fields.Char('适用范围', readonly=True) - image = fields.Binary('图片', readonly=True) + string='刀具等级', readonly=True, related='functional_cutting_tool_id.tool_grade') + machining_accuracy = fields.Float('加工精度(mm)', readonly=True, + related='functional_cutting_tool_id.machining_accuracy') + tool_length = fields.Float('装刀长', readonly=True, related='functional_cutting_tool_id.tool_length') + blade_number = fields.Integer('刃数', readonly=True, related='functional_cutting_tool_id.blade_number') + integral_blade_length = fields.Float('整体刃长(mm)', readonly=True, + related='functional_cutting_tool_id.integral_blade_length') + effective_blade_length = fields.Float('有效刃长(mm)', readonly=True, + related='functional_cutting_tool_id.effective_blade_length') + max_life = fields.Float('最大寿命值', readonly=True, related='functional_cutting_tool_id.max_life') + is_standard = fields.Boolean('是否标准刀', readonly=True, related='functional_cutting_tool_id.is_standard') + applicable_range = fields.Char('适用范围', readonly=True, related='functional_cutting_tool_id.applicable_range') + image = fields.Binary('图片', readonly=True, related='functional_cutting_tool_id.image') # 功能刀具实时分布 - tool_stock_num = fields.Char(string='刀具房库存数量', readonly=False) - side_shelf_num = fields.Char(string='线边货架货架数量', readonly=False) - on_tool_stock_num = fields.Char(string='机内刀库库存数量', readonly=False) - tool_stock_total = fields.Char(string='合计', readonly=False) - return_reuse_num_re = fields.Char(string='归还再用数量(精)', readonly=False) - return_reuse_num_co = fields.Char(string='归还再用数量(粗)', readonly=False) - return_processing_num = fields.Char(string='归还需磨削数量', readonly=False) - return_total = fields.Char(string='合计', readonly=False) - total = fields.Char(string='总计', readonly=False) + tool_stock_num = fields.Integer(string='刀具房库存数量', readonly=False) + side_shelf_num = fields.Integer(string='线边货架货架数量', readonly=False) + on_tool_stock_num = fields.Integer(string='机内刀库库存数量', readonly=False) + tool_stock_total = fields.Integer(string='合计(库存)', readonly=True, compute='_compute_tool_stock_total') + return_reuse_num_re = fields.Integer(string='归还再用数量(精)', readonly=False) + return_reuse_num_co = fields.Integer(string='归还再用数量(粗)', readonly=False) + return_processing_num = fields.Integer(string='归还需磨削数量', readonly=False) + return_total = fields.Integer(string='合计(归还)', readonly=True, compute='_compute_return_total') + total = fields.Integer(string='总计', readonly=True, compute='_compute_total') remark = fields.Char(string='备注/说明', readonly=False) + @api.depends('tool_stock_num', 'side_shelf_num', 'on_tool_stock_num') + def _compute_tool_stock_total(self): + for record in self: + if record: + self.tool_stock_total = record.tool_stock_num + record.side_shelf_num + record.on_tool_stock_num + + @api.depends('return_reuse_num_re', 'return_reuse_num_co', 'return_processing_num') + 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 + + @api.depends('tool_stock_total', 'return_total') + def _compute_total(self): + for record in self: + if record: + self.total = record.tool_stock_total + record.return_total + + class InboundAndOutboundRecordsOfFunctionalTools(models.Model): _name = 'sf.inbound.and.outbound.records.of.functional.tools' _description = '功能刀具出入库记录' functional_cutting_tool_id = fields.Many2one('sf.functional.cutting.tool.entity', '功能刀具', readonly=True) - code = fields.Char('编码', readonly=True) - name = fields.Char('名称', invisible=True, readonly=True) - mrs_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True) + mrs_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True, + tracking=True, group_expand='_read_mrs_cutting_tool_type_ids', + store=True, + compute='_compute_functional_cutting_tool_id') + + @api.model + def _read_mrs_cutting_tool_type_ids(self, categories, domain, order): + mrs_cutting_tool_type_ids = categories._search([], order=order, access_rights_uid=SUPERUSER_ID) + return categories.browse(mrs_cutting_tool_type_ids) + + @api.depends('functional_cutting_tool_id') + def _compute_functional_cutting_tool_id(self): + for record in self: + if record: + 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') + name = fields.Char('名称', invisible=True, readonly=True, related='functional_cutting_tool_id.name') # 整体式刀具型号 mrs_cutting_tool_integral_model_ids = fields.Many2many('sf.cutting.tool.model', - 'sf_inbound_and_outbound_records_of_functional_tools_id', - string='整体式刀具型号', readonly=True, domain= - [('mrs_cutting_tool_material_name', '=', '整体式刀具')]) + 'sf_functional_tool_warning_id', + string='整体式刀具型号', readonly=True, + domain=[ + ('mrs_cutting_tool_material_name', '=', '整体式刀具')], + related='functional_cutting_tool_id.mrs_cutting_tool_integral_model_ids') # 刀片型号 mrs_cutting_tool_blade_model_ids = fields.Many2many('sf.cutting.tool.model', - 'sf_inbound_and_outbound_records_of_functional_tools_id', - string='刀片型号', readonly=True, domain= - [('mrs_cutting_tool_material_name', '=', '刀片')]) + 'sf_functional_tool_warning_id', + string='刀片型号', readonly=True, + domain=[('mrs_cutting_tool_material_name', '=', '刀片')], + related='functional_cutting_tool_id.mrs_cutting_tool_blade_model_ids') # 刀杆型号 mrs_cutting_tool_cutterbar_model_ids = fields.Many2many('sf.cutting.tool.model', - 'sf_inbound_and_outbound_records_of_functional_tools_id', - string='刀杆型号', readonly=True, domain= - [('mrs_cutting_tool_material_name', '=', '刀杆')]) + 'sf_functional_tool_warning_id', + string='刀杆型号', readonly=True, + domain=[('mrs_cutting_tool_material_name', '=', '刀杆')], + related='functional_cutting_tool_id.mrs_cutting_tool_cutterbar_model_ids') # 刀盘型号 mrs_cutting_tool_cutterpad_model_ids = fields.Many2many('sf.cutting.tool.model', - 'sf_inbound_and_outbound_records_of_functional_tools_id', - string='刀盘型号', readonly=True, domain= - [('mrs_cutting_tool_material_name', '=', '刀盘')]) + 'sf_functional_tool_warning_id', + string='刀盘型号', readonly=True, + domain=[('mrs_cutting_tool_material_name', '=', '刀盘')], + related='functional_cutting_tool_id.mrs_cutting_tool_cutterpad_model_ids') # 刀柄型号 mrs_cutting_tool_cutterhandle_model_ids = fields.Many2many('sf.cutting.tool.model', - 'sf_inbound_and_outbound_records_of_functional_tools_id', - string='刀柄型号', readonly=True, domain= - [('mrs_cutting_tool_material_name', '=', '刀柄')]) + 'sf_functional_tool_warning_id', + string='刀柄型号', readonly=True, + domain=[('mrs_cutting_tool_material_name', '=', '刀柄')], + related='functional_cutting_tool_id.mrs_cutting_tool_cutterhandle_model_ids') # 夹头型号 mrs_cutting_tool_cutterhead_model_ids = fields.Many2many('sf.cutting.tool.model', - 'sf_inbound_and_outbound_records_of_functional_tools_id', - string='夹头型号', readonly=True, domain= - [('mrs_cutting_tool_material_name', '=', '夹头')]) + 'sf_functional_tool_warning_id', + string='夹头型号', readonly=True, + domain=[('mrs_cutting_tool_material_name', '=', '夹头')], + related='functional_cutting_tool_id.mrs_cutting_tool_cutterhead_model_ids') - diameter = fields.Float('直径(mm)', readonly=True) + 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) - machining_accuracy = fields.Float('加工精度(mm)', readonly=True) - tool_length = fields.Float('装刀长', 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.Boolean('是否标准刀', readonly=True) - applicable_range = fields.Char('适用范围', readonly=True) - image = fields.Binary('图片', readonly=True) + string='刀具等级', readonly=True, related='functional_cutting_tool_id.tool_grade') + machining_accuracy = fields.Float('加工精度(mm)', readonly=True, + related='functional_cutting_tool_id.machining_accuracy') + tool_length = fields.Float('装刀长', readonly=True, related='functional_cutting_tool_id.tool_length') + blade_number = fields.Integer('刃数', readonly=True, related='functional_cutting_tool_id.blade_number') + integral_blade_length = fields.Float('整体刃长(mm)', readonly=True, + related='functional_cutting_tool_id.integral_blade_length') + effective_blade_length = fields.Float('有效刃长(mm)', readonly=True, + related='functional_cutting_tool_id.effective_blade_length') + max_life = fields.Float('最大寿命值', readonly=True, related='functional_cutting_tool_id.max_life') + is_standard = fields.Boolean('是否标准刀', readonly=True, related='functional_cutting_tool_id.is_standard') + applicable_range = fields.Char('适用范围', readonly=True, related='functional_cutting_tool_id.applicable_range') + image = fields.Binary('图片', readonly=True, related='functional_cutting_tool_id.image') # 功能刀具出入库记录 特有字段 thickness = fields.Selection([('1', '粗'), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=False) @@ -347,9 +434,9 @@ class MachineTableToolChangingApply(models.Model): # string='换刀需求信息', # attrs="{'invisible': 1}") - name = fields.Many2one('sf.machine_tool', string='CNC机床', readonly=False) - machine_table_type_id = fields.Many2one('sf.machine_tool.category', string='机床类型', readonly=False) - machine_tool_code = fields.Char(string='机台号', attrs="{'invisible': 1}") + name = fields.Many2one('maintenance.equipment', string='CNC机床', readonly=False,tracking=True, group_expand='_read_group_names') + machine_table_type_id = fields.Many2one('sf.machine_tool.category', string='机床类型', readonly=True, compute='_compute_name') + machine_tool_code = fields.Char(string='机台号', attrs="{'invisible': 1}", readonly=True, compute='_compute_name') cutter_spacing_code = fields.Char(string='刀位号', readonly=False) functional_tool_code = fields.Char(string='功能刀具编码', readonly=True, compute='_compute_functional_tool_name_id') functional_tool_name_id = fields.Many2one('sf.functional.cutting.tool', string='功能刀具名称', readonly=False) @@ -363,9 +450,9 @@ class MachineTableToolChangingApply(models.Model): used_value = fields.Char(string='已使用值', readonly=False) functional_tool_status = fields.Selection([('正常', '正常'), ('异常', '异常')], string='功能刀具状态', default='正常', readonly=False) - replacement_tool_code = fields.Char(string='待换刀具编码', readonly=True) - replacement_tool_name_id = fields.Many2one('sf.functional.cutting.tool', string='待换刀具名称', readonly=True) - replacement_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='待换刀具类型', readonly=True) + replacement_tool_code = fields.Char(string='待换功能刀具编码', readonly=True) + replacement_tool_name_id = fields.Many2one('sf.functional.cutting.tool', 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) @@ -376,6 +463,20 @@ class MachineTableToolChangingApply(models.Model): status = fields.Selection([('0', '未操作'), ('1', '已换刀申请'), ('2', '已转移')], string='操作状态', default='0') + sf_functional_tool_assembly_id = fields.Many2one('sf.functional.tool.assembly', '功能刀具组装') + + @api.model + def _read_group_names(self, categories, domain, order): + names = categories._search([], order=order, access_rights_uid=SUPERUSER_ID) + return categories.browse(names) + + @api.depends('name') + def _compute_name(self): + for record in self: + if record: + record.machine_table_type_id = record.name.machine_tool_category.id + record.machine_tool_code = record.name.code + @api.depends('functional_tool_name_id') def _compute_functional_tool_name_id(self): for record in self: @@ -383,7 +484,6 @@ class MachineTableToolChangingApply(models.Model): record.functional_tool_code = record.functional_tool_name_id.code record.functional_tool_type_id = record.functional_tool_name_id.mrs_cutting_tool_type_id.id - @api.onchange('functional_tool_status') def automation_apply_for_tool_change(self): """ @@ -459,7 +559,8 @@ class MachineTableToolChangingApply(models.Model): 'used_tool_time': None, 'reason_for_applying': None, 'remark': None, - 'status': '0' + 'status': '0', + 'sf_functional_tool_assembly_id': None, }) @@ -473,6 +574,16 @@ class MachineTableToolChangingApply(models.Model): 'status': '0' }) + def open_sf_functional_tool_assembly(self): + """ + 跳转到功能刀具组装界面按键功能 + :return: + """ + action = self.env.ref('sf_tool_management.sf_functional_tool_assembly_view_act') + result = action.read()[0] + result['domain'] = [('sf_machine_table_tool_changing_apply_id', '=', self.id)] + return result + class CAMWorkOrderProgramKnifePlan(models.Model): _name = 'sf.cam.work.order.program.knife.plan' @@ -484,16 +595,22 @@ class CAMWorkOrderProgramKnifePlan(models.Model): functional_tool_code = fields.Char(string='功能刀具编码', readonly=False) functional_tool_name_id = fields.Many2one('sf.functional.cutting.tool', string='功能刀具名称', readonly=False) functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=False) - machine_table_name_id = fields.Many2one('sf.machine_tool', string='机床名称', readonly=False) + machine_table_name_id = fields.Many2one('maintenance.equipment', string='机床名称', readonly=False, tracking=True, group_expand='_read_group_machine_table_name_ids') + + @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_cutter_spacing_code = fields.Char(string='机床刀位号', readonly=False) diameter = fields.Char(string='直径（程式）', readonly=False) tool_loading_length = fields.Char(string='装刀长', readonly=False) clearance_length = fields.Char(string='避空长', readonly=False) tool_included_angle = fields.Char(string='刀尖角（R角）', readonly=False) L_D = fields.Char(string='L/D', readonly=False) - coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=False) - required_cutting_time = fields.Char(string='需要切割时间', readonly=False) - whether_standard_tool = fields.Boolean(string='是否标准刀', readonly=False) + coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=False, default='2') + required_cutting_time = fields.Char(string='需切削时长', readonly=False) + whether_standard_tool = fields.Selection([('1', '是'), ('0', '否')],string='是否标准刀', readonly=False, default='1') need_knife_time = fields.Datetime(string='需要用刀时间', readonly=False) plan_execute_status = fields.Selection([('0', '待下发'), ('1', '执行中'), ('2', '已完成')], string='计划执行状态', default='0', readonly=False) @@ -501,12 +618,14 @@ class CAMWorkOrderProgramKnifePlan(models.Model): reason_for_applying = fields.Char(string='申请原因', readonly=False) remark = fields.Char(string='备注说明', readonly=False) + sf_functional_tool_assembly_id = fields.Many2one('sf.functional.tool.assembly', '功能刀具组装') + def apply_for_tooling(self): """ 申请装刀 :return: """ - self.env['sf.functional.tool.assembly'].create({ + record = self.env['sf.functional.tool.assembly'].create({ 'functional_tool_code': self.functional_tool_code, 'name': self.functional_tool_name_id.id, 'functional_tool_type_id': self.functional_tool_type_id.id, @@ -520,33 +639,43 @@ class CAMWorkOrderProgramKnifePlan(models.Model): 'use_tool_time': self.need_knife_time, 'machine_tool_name_id': self.machine_table_name_id.id, 'machine_tool_code': self.cam_procedure_code, - 'cutter_spacing_code': self.cam_cutter_spacing_code + 'cutter_spacing_code': self.cam_cutter_spacing_code, + 'sf_cam_work_order_program_knife_plan_id': self.id }) + self.sf_functional_tool_assembly_id = record.id # 将计划执行状态改为执行中 self.env['sf.cam.work.order.program.knife.plan'].search( - [('functional_tool_code', '=', self.functional_tool_code)]).write({'plan_execute_status': '1', - 'applicant': self.env.user.name}) - + [('functional_tool_code', '=', self.functional_tool_code)]).write({ + 'plan_execute_status': '1', + 'applicant': self.env.user.name}) def revocation(self): """ 撤回装刀申请 :return: """ - - self.env['sf.functional.tool.assembly'].search( [('functional_tool_code', '=', self.functional_tool_code), ('loading_task_source', '=', '0')]).unlink() - # 将计划执行状态改为待执行 + # 将计划执行状态改为待执行，同时清除申请人、功能刀具组装字段数据 self.env['sf.cam.work.order.program.knife.plan'].search( - [('functional_tool_code', '=', self.functional_tool_code)]).write({'plan_execute_status': '0', - 'applicant': None}) - - + [('functional_tool_code', '=', self.functional_tool_code)]).write({ + 'plan_execute_status': '0', + 'applicant': None, + 'sf_functional_tool_assembly_id': None, + }) + def open_sf_functional_tool_assembly(self): + """ + 跳转到功能刀具组装界面按键功能 + :return: + """ + action = self.env.ref('sf_tool_management.sf_functional_tool_assembly_view_act') + result = action.read()[0] + result['domain'] = [('sf_cam_work_order_program_knife_plan_id', '=', self.id)] + return result class FunctionalToolAssembly(models.Model): @@ -554,9 +683,17 @@ class FunctionalToolAssembly(models.Model): _description = '功能刀具组装' _order = 'use_tool_time asc' + functional_tool_code = fields.Char(string='功能刀具编码', readonly=True) name = fields.Many2one('sf.functional.cutting.tool', string='功能刀具名称', readonly=True) - functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True) + functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True, + tracking=True, group_expand='_read_group_functional_tool_type_ids') + @api.model + def _read_group_functional_tool_type_ids(self, categories, domain, order): + """读取分组自定义以便在看板视图中显示所有的类别，即使它们为空""" + functional_tool_type_ids = categories._search([], order=order, access_rights_uid=SUPERUSER_ID) + return categories.browse(functional_tool_type_ids) + functional_tool_diameter = fields.Char(string='功能刀具直径', readonly=True) functional_tool_length = fields.Char(string='功能刀具伸出长', readonly=True) functional_tool_cutting_type = fields.Char(string='功能刀具切削类型', readonly=False) @@ -605,7 +742,6 @@ class FunctionalToolAssembly(models.Model): chuck_name = fields.Char('夹头名称', readonly=True) sf_tool_brand_id_6 = fields.Many2one('sf.machine.brand', '夹头品牌', readonly=True) - coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=True) tool_loading_length = fields.Char(string='装刀长', readonly=True) new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧', readonly=True) @@ -621,7 +757,7 @@ class FunctionalToolAssembly(models.Model): assemble_status = fields.Selection([('0', '待组装'), ('1', '已组装'), ('2', '已出库')],string='组装状态', default='0', readonly=True) use_tool_time = fields.Datetime(string='用刀时间', readonly=True) production_line_name_id = fields.Many2one('sf.production.line', string='产线名称', readonly=False) - machine_tool_name_id = fields.Many2one('sf.machine_tool', 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) @@ -632,12 +768,26 @@ 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', '机床换刀申请') + sf_cam_work_order_program_knife_plan_id = fields.Many2one('sf.cam.work.order.program.knife.plan', 'CAM工单程序用刀计划') - @api.onchange('assemble_status') - def check_box(self): - if self.assemble_status != '1': - self.check_box_1 = False + def open_sf_cam_work_order_program_knife_plan(self): + """ + 跳转到CAM工单程序用刀计划界面按钮功能 + """ + action = self.env.ref('sf_tool_management.sf_cam_work_order_program_knife_plan_view_act') + result = action.read()[0] + result['domain'] = [('sf_functional_tool_assembly_id', '=', self.id)] + return result + def open_sf_machine_table_tool_changing_apply(self): + """ + 跳转到机床换刀申请界面按钮功能 + """ + action = self.env.ref('sf_tool_management.sf_machine_table_tool_changing_apply_view_act') + result = action.read()[0] + result['domain'] = [('sf_functional_tool_assembly_id', '=', self.id)] + return result def cancel_functional_tool_assembly(self): """ @@ -645,9 +795,16 @@ class FunctionalToolAssembly(models.Model): :return: """ if self.new_former == '0': - # 如果是新刀，则删除功能刀具列表、 - self.env['sf.functional.cutting.tool.entity'].search([ - ('code', '=', self.functional_tool_code)]).unlink() + # 如果是新刀，则删除功能刀具列表、功能刀具预警、功能刀具实时分布、功能刀具出入库记录的记录 + record = self.env['sf.functional.cutting.tool.entity'].search([ + ('code', '=', self.functional_tool_code)]) + self.env['sf.functional.tool.warning'].search( + [('functional_cutting_tool_id', '=', record.id)]).unlink() + self.env['sf.real.time.distribution.of.functional.tools'].search( + [('functional_cutting_tool_id', '=', record.id)]).unlink() + self.env['sf.inbound.and.outbound.records.of.functional.tools'].search( + [('functional_cutting_tool_id', '=', record.id)]).unlink() + record.unlink() else: # 获取功能刀具缓存信息 record = self.env['sf.functional.cutting.tool.entity.cache'].search([ diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml index 298ae51c..ebf1bc95 100644 --- a/sf_tool_management/views/tool_base_views.xml +++ b/sf_tool_management/views/tool_base_views.xml @@ -235,7 +235,7 @@ - + @@ -313,17 +313,34 @@ - - - - + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + @@ -551,6 +568,9 @@ type="action" context="{ 'default_name':name, 'default_machine_tool_code': machine_tool_code, + 'default_functional_tool_code': functional_tool_code, + 'default_functional_tool_name_id': functional_tool_name_id, + 'default_functional_tool_type_id': functional_tool_type_id, 'default_cutter_spacing_code': cutter_spacing_code, 'default_replacement_tool_code': functional_tool_code, 'default_replacement_tool_name_id': functional_tool_name_id, @@ -571,8 +591,10 @@ class="btn-primary" attrs="{'invisible': [('status', '!=', '0')]}" /> -