From d78fe872aeedec6acf842cc5d11a37f7be3dd0ba Mon Sep 17 00:00:00 2001 From: "qihao.gong@jikimo.com" Date: Fri, 15 Sep 2023 14:26:04 +0800 Subject: [PATCH 01/11] BT50 --- sf_maintenance/models/sf_maintenance.py | 2 +- sf_maintenance/views/maintenance_views.xml | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/sf_maintenance/models/sf_maintenance.py b/sf_maintenance/models/sf_maintenance.py index d66de31e..dadb9aa0 100644 --- a/sf_maintenance/models/sf_maintenance.py +++ b/sf_maintenance/models/sf_maintenance.py @@ -78,7 +78,7 @@ class SfMaintenanceEquipment(models.Model): code = fields.Char('机台号') name = fields.Char('名称') knife_type = fields.Selection( - [("BT40", "BT40"), ("BT30", "BT30")], + [("BT40", "BT40"), ("BT30", "BT30"), ("BT50", "BT50")], default="", string="刀把类型") number_of_knife_library = fields.Integer('刀库数量(把)') rotate_speed = fields.Integer('转速') diff --git a/sf_maintenance/views/maintenance_views.xml b/sf_maintenance/views/maintenance_views.xml index 5c699af0..4a114574 100644 --- a/sf_maintenance/views/maintenance_views.xml +++ b/sf_maintenance/views/maintenance_views.xml @@ -53,8 +53,8 @@ - - + + - + + - + + + + From 618d4718c92916cc9ab4620c2f43516af53c4857 Mon Sep 17 00:00:00 2001 From: "qihao.gong@jikimo.com" Date: Fri, 15 Sep 2023 14:36:29 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=B3=A8=E9=87=8Aocc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/models/product_template.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py index 03f22bea..baf86eb6 100644 --- a/sf_manufacturing/models/product_template.py +++ b/sf_manufacturing/models/product_template.py @@ -1,8 +1,8 @@ from odoo import models, fields, api from odoo.exceptions import ValidationError from odoo.modules import get_resource_path -# from OCC.Extend.DataExchange import read_step_file -# from OCC.Extend.DataExchange import write_stl_file +from OCC.Extend.DataExchange import read_step_file +from OCC.Extend.DataExchange import write_stl_file import logging import base64 import hashlib @@ -738,7 +738,7 @@ class ResProductMo(models.Model): def transition_glb_file(self, report_path, code): shapes = read_step_file(report_path) output_file = os.path.join('/tmp', str(code) + '.stl') - # write_stl_file(shapes, output_file, 'binary', 0.03, 0.5) + write_stl_file(shapes, output_file, 'binary', 0.03, 0.5) # 转化为glb output_glb_file = os.path.join('/tmp', str(code) + '.glb') util_path = get_resource_path('sf_dlm', 'static/util') From 38331f150126ba22c9873ac2ff4314e1907e2114 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?WEB=E8=AE=B8=E4=BD=95=E5=93=B2=5Cxuhez?= Date: Fri, 15 Sep 2023 14:42:12 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A1=A8=E5=A4=B4?= =?UTF-8?q?=E5=9B=BA=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jikimo_frontend/static/src/scss/custom_style.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jikimo_frontend/static/src/scss/custom_style.scss b/jikimo_frontend/static/src/scss/custom_style.scss index f557fe38..f0b583bf 100644 --- a/jikimo_frontend/static/src/scss/custom_style.scss +++ b/jikimo_frontend/static/src/scss/custom_style.scss @@ -161,7 +161,7 @@ td.o_required_modifier { .o_list_view .o_list_table thead { position: sticky; top: 0; - z-index: 100000; + //z-index: 100000; } //.o_list_view .o_list_table { // height: 1799px !important; From 0ae5d724d662814a1f759c5cf1a15bb61d3f909c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?WEB=E8=AE=B8=E4=BD=95=E5=93=B2=5Cxuhez?= Date: Fri, 15 Sep 2023 17:15:35 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E8=A1=A8=E5=A4=B4=E5=9B=BA=E5=AE=9A?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jikimo_frontend/static/src/scss/custom_style.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jikimo_frontend/static/src/scss/custom_style.scss b/jikimo_frontend/static/src/scss/custom_style.scss index f0b583bf..60a4968d 100644 --- a/jikimo_frontend/static/src/scss/custom_style.scss +++ b/jikimo_frontend/static/src/scss/custom_style.scss @@ -172,7 +172,7 @@ td.o_required_modifier { .o_form_view.o_xxl_form_view .o_form_sheet_bg > .o_form_statusbar { position: sticky !important; top: 0; - z-index: 100000; + //z-index: 100000; } //----------------------------------------------------------- From 586dc5dbe2746ed232a3aaa58a9df341daed4b93 Mon Sep 17 00:00:00 2001 From: "qihao.gong@jikimo.com" Date: Mon, 18 Sep 2023 10:07:52 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E4=BC=98=E5=8C=96sf=E5=AE=B9=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- odoo.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/odoo.conf b/odoo.conf index 0ccb3899..54012aa4 100644 --- a/odoo.conf +++ b/odoo.conf @@ -53,10 +53,10 @@ syslog = False test_enable = False test_file = test_tags = None -transient_age_limit = 1.0 -translate_modules = ['all'] +;transient_age_limit = 1.0 +;translate_modules = ['all'] unaccent = False upgrade_path = without_demo = False -workers = 0 +workers = 8 From dc796abd4ab716fc0204ec5f54b8fefc78dbedab Mon Sep 17 00:00:00 2001 From: "qihao.gong@jikimo.com" Date: Mon, 18 Sep 2023 10:40:29 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E4=BC=98=E5=8C=96sf=E5=AE=B9=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- odoo.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/odoo.conf b/odoo.conf index 54012aa4..51d61064 100644 --- a/odoo.conf +++ b/odoo.conf @@ -58,5 +58,5 @@ test_tags = None unaccent = False upgrade_path = without_demo = False -workers = 8 +workers = 0 From d4180df7e9f7fd6704da6a8adfc29639da354d6a Mon Sep 17 00:00:00 2001 From: yuxianghui <1608204036@qq.com> Date: Tue, 19 Sep 2023 16:14:29 +0800 Subject: [PATCH 07/11] =?UTF-8?q?1=E3=80=81=E5=88=80=E5=85=B7=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=A8=A1=E5=9D=97=E4=B8=8B=E7=9A=84=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=88=80=E5=85=B7=E5=86=85=E7=9A=84=E5=88=80=E5=85=B7=E7=89=A9?= =?UTF-8?q?=E6=96=99=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B=E4=BB=8Emany2many?= =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=B8=BAmany2one=EF=BC=8C=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E4=BB=8E=E5=88=80=E5=85=B7=E5=9E=8B=E5=8F=B7?= =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=B8=BA=E5=88=80=E5=85=B7=E7=89=A9=E6=96=99?= =?UTF-8?q?=EF=BC=9B2=E3=80=81=E5=AF=B9=E5=8A=9F=E8=83=BD=E5=88=80?= =?UTF-8?q?=E5=85=B7=E7=BB=84=E8=A3=85=E7=9A=84=E7=BB=84=E8=A3=85=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=92=8C=E5=8F=96=E6=B6=88=E7=BB=84=E8=A3=85=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E8=BF=9B=E8=A1=8C=E4=BA=86=E9=80=BB=E8=BE=91=E4=BC=98?= =?UTF-8?q?=E5=8C=96=EF=BC=9B3=E3=80=81=E6=96=B0=E5=A2=9E=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=88=80=E5=85=B7=E7=BB=84=E8=A3=85=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E7=9A=84=E5=88=80=E5=85=B7=E7=89=A9=E6=96=99?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=A0=B9=E6=8D=AE=E6=89=80=E9=80=89=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=88=80=E5=85=B7=E5=AD=97=E6=AE=B5=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=9B4=E3=80=81=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E4=BA=86=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E3=80=81=E9=A2=84=E8=AD=A6=E3=80=81=E5=AE=9E=E6=97=B6=E5=88=86?= =?UTF-8?q?=E5=B8=83=E3=80=81=E5=87=BA=E5=85=A5=E5=BA=93=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E7=9A=84=E5=88=9B=E5=BB=BA=E3=80=81=E4=BF=AE=E6=94=B9=E3=80=81?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD=EF=BC=9B5=E3=80=81?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7=E5=88=97=E8=A1=A8=E5=AF=B9?= =?UTF-8?q?=E8=B1=A1=E6=96=B0=E5=A2=9E=E5=88=80=E5=85=B7=E8=83=BD=E5=8A=9B?= =?UTF-8?q?=E5=8F=82=E6=95=B0=EF=BC=9B6=E3=80=81=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E4=BA=86=E5=88=80=E5=85=B7=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E7=9A=84=E6=9D=83=E9=99=90=E7=9B=B8=E5=85=B3=E8=AD=A6=E5=91=8A?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_tool_management/__manifest__.py | 2 +- sf_tool_management/models/base.py | 491 ++++++++---------- .../models/tool_material_search.py | 22 +- .../security/ir.model.access.csv | 8 +- sf_tool_management/views/tool_base_views.xml | 431 +++++++-------- sf_tool_management/wizard/wizard.py | 407 +++++++++------ sf_tool_management/wizard/wizard_view.xml | 62 ++- 7 files changed, 699 insertions(+), 724 deletions(-) diff --git a/sf_tool_management/__manifest__.py b/sf_tool_management/__manifest__.py index 10813c3d..345baa00 100644 --- a/sf_tool_management/__manifest__.py +++ b/sf_tool_management/__manifest__.py @@ -10,7 +10,7 @@ """, 'category': 'sf', 'website': 'https://www.sf.jikimo.com', - 'depends': ['account', 'sf_base', 'mrp', 'sf_manufacturing'], + 'depends': ['account', 'sf_base', 'mrp', 'sf_manufacturing', 'sf_maintenance'], 'data': [ #'security/group_security.xml', 'security/ir.model.access.csv', diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py index 9ae2a422..5625aab6 100644 --- a/sf_tool_management/models/base.py +++ b/sf_tool_management/models/base.py @@ -24,46 +24,28 @@ class FunctionalCuttingToolEntity(models.Model): return categories.browse(mrs_cutting_tool_type_ids) # 整体式刀具型号 - mrs_cutting_tool_integral_model_ids = fields.Many2many('sf.cutting.tool.model', - 'sf_functional_cutting_tool_entity_id', - string='整体式刀具型号', domain= - [('cutting_tool_type', '=', '整体式刀具')]) + cutting_tool_integral_model_id = fields.Many2one('sf.tool.material.search', string='整体式刀具型号', readonly=True, + domain=[('cutting_tool_type', '=', '整体式刀具')]) + # 刀片型号 - mrs_cutting_tool_blade_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_cutting_tool_entity_id', - string='刀片型号', domain= - [('cutting_tool_type', '=', '刀片')]) + cutting_tool_blade_model_id = fields.Many2one('sf.tool.material.search', string='刀片型号', readonly=True, + domain=[('cutting_tool_type', '=', '刀片')]) + # 刀杆型号 - mrs_cutting_tool_cutterbar_model_ids = fields.Many2many('sf.cutting.tool.model', - 'sf_functional_cutting_tool_entity_id', - string='刀杆型号', domain= - [('cutting_tool_type', '=', '刀杆')]) + cutting_tool_cutterbar_model_id = fields.Many2one('sf.tool.material.search', string='刀杆型号', readonly=True, + domain=[('cutting_tool_type', '=', '刀杆')]) + # 刀盘型号 - mrs_cutting_tool_cutterpad_model_ids = fields.Many2many('sf.cutting.tool.model', - 'sf_functional_cutting_tool_entity_id', - string='刀盘型号', domain= - [('cutting_tool_type', '=', '刀盘')]) + cutting_tool_cutterpad_model_id = fields.Many2one('sf.tool.material.search', string='刀盘型号', readonly=True, + domain=[('cutting_tool_type', '=', '刀盘')]) + # 刀柄型号 - mrs_cutting_tool_cutterhandle_model_ids = fields.Many2many('sf.cutting.tool.model', - 'sf_functional_cutting_tool_entity_id', - string='刀柄型号', domain= - [('cutting_tool_type', '=', '刀柄')]) + cutting_tool_cutterhandle_model_id = fields.Many2one('sf.tool.material.search', string='刀柄型号', readonly=True, + domain=[('cutting_tool_type', '=', '刀柄')]) + # 夹头型号 - mrs_cutting_tool_cutterhead_model_ids = fields.Many2many('sf.cutting.tool.model', - 'sf_functional_cutting_tool_entity_id', - string='夹头型号', domain= - [('cutting_tool_type', '=', '夹头')]) - # cutting_tool_material = fields.Selection([('0', '整体式刀具'), ('1', '组合式刀具')], string='刀具物料', default='0') - # - # @api.onchange('cutting_tool_material') - # def _onchange_cutting_tool_material(self): - # for record in self: - # if record: - # if record.cutting_tool_material == '1': - # record.mrs_cutting_tool_integral_model_ids = None - # if record.cutting_tool_material == '0': - # record.mrs_cutting_tool_blade_model_ids = None - # record.mrs_cutting_tool_cutterbar_model_ids = None - # record.mrs_cutting_tool_cutterpad_model_ids = None + cutting_tool_cutterhead_model_id = fields.Many2one('sf.tool.material.search', string='夹头型号', readonly=True, + domain=[('cutting_tool_type', '=', '夹头')]) diameter = fields.Float('直径(mm)') tool_grade = fields.Selection([('1', 'P1'), ('2', 'P2'), ('3', 'P3'), ('4', 'P4'), ('5', 'P5'), ('6', 'P6')], @@ -78,6 +60,31 @@ class FunctionalCuttingToolEntity(models.Model): applicable_range = fields.Char('适用范围') image = fields.Binary('图片') + 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_ids = fields.Many2many('maintenance.equipment.image', + 'rel_blade_tip_product_template_tool_entity', '刀尖特征', + domain=[('type', '=', '刀尖特征')], + related='cutting_tool_integral_model_id.blade_tip_characteristics_ids') + + 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 = [] for item in functional_tool_model_code: @@ -96,48 +103,28 @@ class FunctionalCuttingToolEntityCache(models.Model): mrs_cutting_tool_model_id = fields.Many2one('sf.cutting.tool.model', string='刀具型号') # 整体式刀具型号 - mrs_cutting_tool_integral_model_ids = fields.Many2many('sf.cutting.tool.model', - 'sf_functional_cutting_tool_entity_cache_id', - string='整体式刀具型号', domain= - [('cutting_tool_type', '=', '整体式刀具')]) - # 刀片型号 - mrs_cutting_tool_blade_model_ids = fields.Many2many('sf.cutting.tool.model', - 'sf_functional_cutting_tool_entity_cache_id', - string='刀片型号', domain= - [('cutting_tool_type', '=', '刀片')]) - # 刀杆型号 - mrs_cutting_tool_cutterbar_model_ids = fields.Many2many('sf.cutting.tool.model', - 'sf_functional_cutting_tool_entity_cache_id', - string='刀杆型号', domain= - [('cutting_tool_type', '=', '刀杆')]) - # 刀盘型号 - mrs_cutting_tool_cutterpad_model_ids = fields.Many2many('sf.cutting.tool.model', - 'sf_functional_cutting_tool_entity_cache_id', - string='刀盘型号', domain= - [('cutting_tool_type', '=', '刀盘')]) - # 刀柄型号 - mrs_cutting_tool_cutterhandle_model_ids = fields.Many2many('sf.cutting.tool.model', - 'sf_functional_cutting_tool_entity_cache_id', - string='刀柄型号', domain= - [('cutting_tool_type', '=', '刀柄')]) - # 夹头型号 - mrs_cutting_tool_cutterhead_model_ids = fields.Many2many('sf.cutting.tool.model', - 'sf_functional_cutting_tool_entity_cache_id', - string='夹头型号', domain= - [('cutting_tool_type', '=', '夹头')]) - # cutting_tool_material = fields.Selection([('0', '整体式刀具'), ('1', '组合式刀具')], string='刀具物料', default='0') - # - # @api.onchange('cutting_tool_material') - # def _onchange_cutting_tool_material(self): - # for record in self: - # if record: - # if record.cutting_tool_material == '1': - # record.mrs_cutting_tool_integral_model_ids = None - # if record.cutting_tool_material == '0': - # record.mrs_cutting_tool_blade_model_ids = None - # record.mrs_cutting_tool_cutterbar_model_ids = None - # record.mrs_cutting_tool_cutterpad_model_ids = None + cutting_tool_integral_model_id = fields.Many2one('sf.tool.material.search', string='整体式刀具型号', readonly=True, + domain=[('cutting_tool_type', '=', '整体式刀具')]) + # 刀片型号 + cutting_tool_blade_model_id = fields.Many2one('sf.tool.material.search', string='刀片型号', readonly=True, + domain=[('cutting_tool_type', '=', '刀片')]) + + # 刀杆型号 + cutting_tool_cutterbar_model_id = fields.Many2one('sf.tool.material.search', string='刀杆型号', readonly=True, + domain=[('cutting_tool_type', '=', '刀杆')]) + + # 刀盘型号 + cutting_tool_cutterpad_model_id = fields.Many2one('sf.tool.material.search', string='刀盘型号', readonly=True, + domain=[('cutting_tool_type', '=', '刀盘')]) + + # 刀柄型号 + cutting_tool_cutterhandle_model_id = fields.Many2one('sf.tool.material.search', string='刀柄型号', readonly=True, + domain=[('cutting_tool_type', '=', '刀柄')]) + + # 夹头型号 + cutting_tool_cutterhead_model_id = fields.Many2one('sf.tool.material.search', string='夹头型号', readonly=True, + domain=[('cutting_tool_type', '=', '夹头')]) diameter = fields.Float('直径(mm)') tool_grade = fields.Selection([('1', 'P1'), ('2', 'P2'), ('3', 'P3'), ('4', 'P4'), ('5', 'P5'), ('6', 'P6')], @@ -166,54 +153,34 @@ class FunctionalToolWarning(models.Model): 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=[ - ('cutting_tool_type', '=', '整体式刀具')], - related='functional_cutting_tool_id.mrs_cutting_tool_integral_model_ids') + cutting_tool_integral_model_id = fields.Many2one('sf.tool.material.search', string='整体式刀具型号', readonly=True, + domain=[('cutting_tool_type', '=', '整体式刀具')], + related='functional_cutting_tool_id.cutting_tool_integral_model_id') + # 刀片型号 - mrs_cutting_tool_blade_model_ids = fields.Many2many('sf.cutting.tool.model', - 'sf_functional_tool_warning_id', - string='刀片型号', readonly=True, - domain=[('cutting_tool_type', '=', '刀片')], - related='functional_cutting_tool_id.mrs_cutting_tool_blade_model_ids') + cutting_tool_blade_model_id = fields.Many2one('sf.tool.material.search', string='刀片型号', readonly=True, + domain=[('cutting_tool_type', '=', '刀片')], + related='functional_cutting_tool_id.cutting_tool_blade_model_id') + # 刀杆型号 - mrs_cutting_tool_cutterbar_model_ids = fields.Many2many('sf.cutting.tool.model', - 'sf_functional_tool_warning_id', - string='刀杆型号', readonly=True, - domain=[('cutting_tool_type', '=', '刀杆')], - related='functional_cutting_tool_id.mrs_cutting_tool_cutterbar_model_ids') + cutting_tool_cutterbar_model_id = fields.Many2one('sf.tool.material.search', string='刀杆型号', readonly=True, + domain=[('cutting_tool_type', '=', '刀杆')], + related='functional_cutting_tool_id.cutting_tool_cutterbar_model_id') + # 刀盘型号 - mrs_cutting_tool_cutterpad_model_ids = fields.Many2many('sf.cutting.tool.model', - 'sf_functional_tool_warning_id', - string='刀盘型号', readonly=True, - domain=[('cutting_tool_type', '=', '刀盘')], - related='functional_cutting_tool_id.mrs_cutting_tool_cutterpad_model_ids') + cutting_tool_cutterpad_model_id = fields.Many2one('sf.tool.material.search', string='刀盘型号', readonly=True, + domain=[('cutting_tool_type', '=', '刀盘')], + related='functional_cutting_tool_id.cutting_tool_cutterpad_model_id') + # 刀柄型号 - mrs_cutting_tool_cutterhandle_model_ids = fields.Many2many('sf.cutting.tool.model', - 'sf_functional_tool_warning_id', - string='刀柄型号', readonly=True, - domain=[('cutting_tool_type', '=', '刀柄')], - related='functional_cutting_tool_id.mrs_cutting_tool_cutterhandle_model_ids') + cutting_tool_cutterhandle_model_id = fields.Many2one('sf.tool.material.search', string='刀柄型号', readonly=True, + domain=[('cutting_tool_type', '=', '刀柄')], + related='functional_cutting_tool_id.cutting_tool_cutterhandle_model_id') + # 夹头型号 - mrs_cutting_tool_cutterhead_model_ids = fields.Many2many('sf.cutting.tool.model', - 'sf_functional_tool_warning_id', - string='夹头型号', readonly=True, - domain=[('cutting_tool_type', '=', '夹头')], - related='functional_cutting_tool_id.mrs_cutting_tool_cutterhead_model_ids') - # cutting_tool_material = fields.Selection([('0', '整体式刀具'), ('1', '组合式刀具')], string='刀具物料', default='0') - # - # @api.onchange('cutting_tool_material') - # def _onchange_cutting_tool_material(self): - # for record in self: - # if record: - # if record.cutting_tool_material == '1': - # record.mrs_cutting_tool_integral_model_ids = None - # if record.cutting_tool_material == '0': - # record.mrs_cutting_tool_blade_model_ids = None - # record.mrs_cutting_tool_cutterbar_model_ids = None - # record.mrs_cutting_tool_cutterpad_model_ids = None + cutting_tool_cutterhead_model_id = fields.Many2one('sf.tool.material.search', string='夹头型号', readonly=True, + domain=[('cutting_tool_type', '=', '夹头')], + 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')], @@ -230,7 +197,7 @@ class FunctionalToolWarning(models.Model): 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, + 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') @@ -300,54 +267,34 @@ class RealTimeDistributionOfFunctionalTools(models.Model): # 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=[ - ('cutting_tool_type', '=', '整体式刀具')], - related='functional_cutting_tool_id.mrs_cutting_tool_integral_model_ids') + cutting_tool_integral_model_id = fields.Many2one('sf.tool.material.search', string='整体式刀具型号', readonly=True, + domain=[('cutting_tool_type', '=', '整体式刀具')], + related='functional_cutting_tool_id.cutting_tool_integral_model_id') + # 刀片型号 - mrs_cutting_tool_blade_model_ids = fields.Many2many('sf.cutting.tool.model', - 'sf_functional_tool_warning_id', - string='刀片型号', readonly=True, - domain=[('cutting_tool_type', '=', '刀片')], - related='functional_cutting_tool_id.mrs_cutting_tool_blade_model_ids') + cutting_tool_blade_model_id = fields.Many2one('sf.tool.material.search', string='刀片型号', readonly=True, + domain=[('cutting_tool_type', '=', '刀片')], + related='functional_cutting_tool_id.cutting_tool_blade_model_id') + # 刀杆型号 - mrs_cutting_tool_cutterbar_model_ids = fields.Many2many('sf.cutting.tool.model', - 'sf_functional_tool_warning_id', - string='刀杆型号', readonly=True, - domain=[('cutting_tool_type', '=', '刀杆')], - related='functional_cutting_tool_id.mrs_cutting_tool_cutterbar_model_ids') + cutting_tool_cutterbar_model_id = fields.Many2one('sf.tool.material.search', string='刀杆型号', readonly=True, + domain=[('cutting_tool_type', '=', '刀杆')], + related='functional_cutting_tool_id.cutting_tool_cutterbar_model_id') + # 刀盘型号 - mrs_cutting_tool_cutterpad_model_ids = fields.Many2many('sf.cutting.tool.model', - 'sf_functional_tool_warning_id', - string='刀盘型号', readonly=True, - domain=[('cutting_tool_type', '=', '刀盘')], - related='functional_cutting_tool_id.mrs_cutting_tool_cutterpad_model_ids') + cutting_tool_cutterpad_model_id = fields.Many2one('sf.tool.material.search', string='刀盘型号', readonly=True, + domain=[('cutting_tool_type', '=', '刀盘')], + related='functional_cutting_tool_id.cutting_tool_cutterpad_model_id') + # 刀柄型号 - mrs_cutting_tool_cutterhandle_model_ids = fields.Many2many('sf.cutting.tool.model', - 'sf_functional_tool_warning_id', - string='刀柄型号', readonly=True, - domain=[('cutting_tool_type', '=', '刀柄')], - related='functional_cutting_tool_id.mrs_cutting_tool_cutterhandle_model_ids') + cutting_tool_cutterhandle_model_id = fields.Many2one('sf.tool.material.search', string='刀柄型号', readonly=True, + domain=[('cutting_tool_type', '=', '刀柄')], + related='functional_cutting_tool_id.cutting_tool_cutterhandle_model_id') + # 夹头型号 - mrs_cutting_tool_cutterhead_model_ids = fields.Many2many('sf.cutting.tool.model', - 'sf_functional_tool_warning_id', - string='夹头型号', readonly=True, - domain=[('cutting_tool_type', '=', '夹头')], - related='functional_cutting_tool_id.mrs_cutting_tool_cutterhead_model_ids') - # cutting_tool_material = fields.Selection([('0', '整体式刀具'), ('1', '组合式刀具')], string='刀具物料', default='0') - # - # @api.onchange('cutting_tool_material') - # def _onchange_cutting_tool_material(self): - # for record in self: - # if record: - # if record.cutting_tool_material == '1': - # record.mrs_cutting_tool_integral_model_ids = None - # if record.cutting_tool_material == '0': - # record.mrs_cutting_tool_blade_model_ids = None - # record.mrs_cutting_tool_cutterbar_model_ids = None - # record.mrs_cutting_tool_cutterpad_model_ids = None + cutting_tool_cutterhead_model_id = fields.Many2one('sf.tool.material.search', string='夹头型号', readonly=True, + domain=[('cutting_tool_type', '=', '夹头')], + 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')], @@ -361,7 +308,7 @@ class RealTimeDistributionOfFunctionalTools(models.Model): 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, + 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') @@ -428,54 +375,34 @@ class InboundAndOutboundRecordsOfFunctionalTools(models.Model): 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_functional_tool_warning_id', - string='整体式刀具型号', readonly=True, - domain=[ - ('cutting_tool_type', '=', '整体式刀具')], - related='functional_cutting_tool_id.mrs_cutting_tool_integral_model_ids') + cutting_tool_integral_model_id = fields.Many2one('sf.tool.material.search', string='整体式刀具型号', readonly=True, + domain=[('cutting_tool_type', '=', '整体式刀具')], + related='functional_cutting_tool_id.cutting_tool_integral_model_id') + # 刀片型号 - mrs_cutting_tool_blade_model_ids = fields.Many2many('sf.cutting.tool.model', - 'sf_functional_tool_warning_id', - string='刀片型号', readonly=True, - domain=[('cutting_tool_type', '=', '刀片')], - related='functional_cutting_tool_id.mrs_cutting_tool_blade_model_ids') + cutting_tool_blade_model_id = fields.Many2one('sf.tool.material.search', string='刀片型号', readonly=True, + domain=[('cutting_tool_type', '=', '刀片')], + related='functional_cutting_tool_id.cutting_tool_blade_model_id') + # 刀杆型号 - mrs_cutting_tool_cutterbar_model_ids = fields.Many2many('sf.cutting.tool.model', - 'sf_functional_tool_warning_id', - string='刀杆型号', readonly=True, - domain=[('cutting_tool_type', '=', '刀杆')], - related='functional_cutting_tool_id.mrs_cutting_tool_cutterbar_model_ids') + cutting_tool_cutterbar_model_id = fields.Many2one('sf.tool.material.search', string='刀杆型号', readonly=True, + domain=[('cutting_tool_type', '=', '刀杆')], + related='functional_cutting_tool_id.cutting_tool_cutterbar_model_id') + # 刀盘型号 - mrs_cutting_tool_cutterpad_model_ids = fields.Many2many('sf.cutting.tool.model', - 'sf_functional_tool_warning_id', - string='刀盘型号', readonly=True, - domain=[('cutting_tool_type', '=', '刀盘')], - related='functional_cutting_tool_id.mrs_cutting_tool_cutterpad_model_ids') + cutting_tool_cutterpad_model_id = fields.Many2one('sf.tool.material.search', string='刀盘型号', readonly=True, + domain=[('cutting_tool_type', '=', '刀盘')], + related='functional_cutting_tool_id.cutting_tool_cutterpad_model_id') + # 刀柄型号 - mrs_cutting_tool_cutterhandle_model_ids = fields.Many2many('sf.cutting.tool.model', - 'sf_functional_tool_warning_id', - string='刀柄型号', readonly=True, - domain=[('cutting_tool_type', '=', '刀柄')], - related='functional_cutting_tool_id.mrs_cutting_tool_cutterhandle_model_ids') + cutting_tool_cutterhandle_model_id = fields.Many2one('sf.tool.material.search', string='刀柄型号', readonly=True, + domain=[('cutting_tool_type', '=', '刀柄')], + related='functional_cutting_tool_id.cutting_tool_cutterhandle_model_id') + # 夹头型号 - mrs_cutting_tool_cutterhead_model_ids = fields.Many2many('sf.cutting.tool.model', - 'sf_functional_tool_warning_id', - string='夹头型号', readonly=True, - domain=[('cutting_tool_type', '=', '夹头')], - related='functional_cutting_tool_id.mrs_cutting_tool_cutterhead_model_ids') - # cutting_tool_material = fields.Selection([('0', '整体式刀具'), ('1', '组合式刀具')], string='刀具物料', default='0') - # - # @api.onchange('cutting_tool_material') - # def _onchange_cutting_tool_material(self): - # for record in self: - # if record: - # if record.cutting_tool_material == '1': - # record.mrs_cutting_tool_integral_model_ids = None - # if record.cutting_tool_material == '0': - # record.mrs_cutting_tool_blade_model_ids = None - # record.mrs_cutting_tool_cutterbar_model_ids = None - # record.mrs_cutting_tool_cutterpad_model_ids = None + cutting_tool_cutterhead_model_id = fields.Many2one('sf.tool.material.search', string='夹头型号', readonly=True, + domain=[('cutting_tool_type', '=', '夹头')], + 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')], @@ -489,7 +416,7 @@ class InboundAndOutboundRecordsOfFunctionalTools(models.Model): 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, + 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') @@ -549,11 +476,24 @@ class MachineTableToolChangingApply(models.Model): # string='换刀需求信息', # attrs="{'invisible': 1}") - name = fields.Many2one('maintenance.equipment', string='CNC机床',required=True, readonly=False, + name = fields.Many2one('maintenance.equipment', string='CNC机床', required=True, readonly=False, group_expand='_read_group_names') machine_table_type_id = fields.Many2one('maintenance.equipment.category', string='机床类型', readonly=True, - compute='_compute_name') - machine_tool_code = fields.Char(string='机台号', invisible=True, readonly=True, compute='_compute_name') + compute='_compute_machine_table_type_id') + machine_tool_code = fields.Char(string='机台号', invisible=True, readonly=True, compute='_compute_machine_tool_code') + + @api.depends('name') + def _compute_machine_table_type_id(self): + for record in self: + if record: + record.machine_table_type_id = record.name.category_id.id + + @api.depends('name') + def _compute_machine_tool_code(self): + for record in self: + if record: + record.machine_tool_code = record.name.code + 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) @@ -591,13 +531,6 @@ class MachineTableToolChangingApply(models.Model): 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.category_id.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: @@ -613,7 +546,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_code': self.functional_tool_code, @@ -767,8 +700,8 @@ class CAMWorkOrderProgramKnifePlan(models.Model): # 将计划执行状态改为执行中 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}) + 'plan_execute_status': '1', + 'applicant': self.env.user.name}) def revocation(self): """ @@ -782,10 +715,10 @@ class CAMWorkOrderProgramKnifePlan(models.Model): # 将计划执行状态改为待执行，同时清除申请人、功能刀具组装字段数据 self.env['sf.cam.work.order.program.knife.plan'].search( [('functional_tool_code', '=', self.functional_tool_code)]).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, + }) def open_sf_functional_tool_assembly(self): """ @@ -806,7 +739,7 @@ class FunctionalToolAssembly(models.Model): 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, - group_expand='_read_group_functional_tool_type_ids') + group_expand='_read_group_functional_tool_type_ids') @api.model def _read_group_functional_tool_type_ids(self, categories, domain, order): @@ -819,46 +752,39 @@ class FunctionalToolAssembly(models.Model): functional_tool_cutting_type = fields.Char(string='功能刀具切削类型', readonly=False) # 整体式刀具型号 - mrs_cutting_tool_integral_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_assembly_id', - string='整体式刀具型号', readonly=True, domain= - [('cutting_tool_type', '=', '整体式刀具')]) + cutting_tool_integral_model_id = fields.Many2one('sf.tool.material.search', string='整体式刀具型号', readonly=True, + domain=[('cutting_tool_type', '=', '整体式刀具')]) integral_code = fields.Char('整体式刀具序列号', readonly=True) integral_name = fields.Char('整体式刀具名称', readonly=True) sf_tool_brand_id_1 = fields.Many2one('sf.machine.brand', '整体式刀具品牌', readonly=True) # 刀片型号 - mrs_cutting_tool_blade_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_assembly_id', - string='刀片型号', readonly=True, domain= - [('cutting_tool_type', '=', '刀片')]) + cutting_tool_blade_model_id = fields.Many2one('sf.tool.material.search', string='刀片型号', readonly=True, + domain=[('cutting_tool_type', '=', '刀片')]) blade_code = fields.Char('刀片序列号', readonly=True) blade_name = fields.Char('刀片名称', readonly=True) sf_tool_brand_id_2 = fields.Many2one('sf.machine.brand', '刀片品牌', readonly=True) # 刀杆型号 - mrs_cutting_tool_cutterbar_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_assembly_id', - string='刀杆型号', readonly=True, domain= - [('cutting_tool_type', '=', '刀杆')]) + cutting_tool_cutterbar_model_id = fields.Many2one('sf.tool.material.search', string='刀杆型号', readonly=True, + domain=[('cutting_tool_type', '=', '刀杆')]) bar_code = fields.Char('刀杆序列号', readonly=True) bar_name = fields.Char('刀杆名称', readonly=True) sf_tool_brand_id_3 = fields.Many2one('sf.machine.brand', '刀杆品牌', readonly=True) # 刀盘型号 - mrs_cutting_tool_cutterpad_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_assembly_id', - string='刀盘型号', readonly=True, domain= - [('cutting_tool_type', '=', '刀盘')]) + cutting_tool_cutterpad_model_id = fields.Many2one('sf.tool.material.search', string='刀盘型号', readonly=True, + domain=[('cutting_tool_type', '=', '刀盘')]) pad_code = fields.Char('刀盘序列号', readonly=True) pad_name = fields.Char('刀盘名称', readonly=True) sf_tool_brand_id_4 = fields.Many2one('sf.machine.brand', '刀盘品牌', readonly=True) # 刀柄型号 - mrs_cutting_tool_cutterhandle_model_ids = fields.Many2many('sf.cutting.tool.model', - 'sf_functional_tool_assembly_id', - string='刀柄型号', readonly=True, domain= - [('cutting_tool_type', '=', '刀柄')]) + cutting_tool_cutterhandle_model_id = fields.Many2one('sf.tool.material.search', string='刀柄型号', readonly=True, + domain=[('cutting_tool_type', '=', '刀柄')]) handle_code = fields.Char('刀柄序列号', readonly=True) handle_name = fields.Char('刀柄名称', readonly=True) sf_tool_brand_id_5 = fields.Many2one('sf.machine.brand', '刀柄品牌', readonly=True) # 夹头型号 - mrs_cutting_tool_cutterhead_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_assembly_id', - string='夹头型号', readonly=True, domain= - [('cutting_tool_type', '=', '夹头')]) + cutting_tool_cutterhead_model_id = fields.Many2one('sf.tool.material.search', string='夹头型号', readonly=True, + domain=[('cutting_tool_type', '=', '夹头')]) chuck_code = fields.Char('夹头序列号', readonly=True) chuck_name = fields.Char('夹头名称', readonly=True) sf_tool_brand_id_6 = fields.Many2one('sf.machine.brand', '夹头品牌', readonly=True) @@ -932,72 +858,65 @@ class FunctionalToolAssembly(models.Model): # 获取功能刀具缓存信息 record = self.env['sf.functional.cutting.tool.entity.cache'].search([ ('code', '=', self.functional_tool_code)], limit=1) - # 删除现有功能刀具列表记录 + # # 删除现有功能刀具列表记录 + # self.env['sf.functional.cutting.tool.entity'].search([ + # ('code', '=', self.functional_tool_code)]).unlink() + # 修改功能刀具列表信息 self.env['sf.functional.cutting.tool.entity'].search([ - ('code', '=', self.functional_tool_code)]).unlink() - # 创建新的功能刀具列表信息 - self.env['sf.functional.cutting.tool.entity'].create({ - 'code': record.code, - 'name': record.name, - 'mrs_cutting_tool_type_id': record.mrs_cutting_tool_type_id.id, - 'mrs_cutting_tool_model_id': record.mrs_cutting_tool_model_id.id, - 'mrs_cutting_tool_integral_model_ids': record.mrs_cutting_tool_integral_model_ids.ids, - 'mrs_cutting_tool_blade_model_ids': record.mrs_cutting_tool_blade_model_ids.ids, - 'mrs_cutting_tool_cutterbar_model_ids': record.mrs_cutting_tool_cutterbar_model_ids.ids, - 'mrs_cutting_tool_cutterpad_model_ids': record.mrs_cutting_tool_cutterpad_model_ids.ids, - 'mrs_cutting_tool_cutterhandle_model_ids': record.mrs_cutting_tool_cutterhandle_model_ids.ids, - 'mrs_cutting_tool_cutterhead_model_ids': record.mrs_cutting_tool_cutterhead_model_ids.ids, - 'diameter': record.diameter, - 'tool_grade': record.tool_grade, - 'machining_accuracy': record.machining_accuracy, - 'tool_length': record.tool_length, - 'blade_number': record.blade_number, - 'integral_blade_length': record.integral_blade_length, - 'effective_blade_length': record.effective_blade_length, - 'max_life': record.max_life, - 'is_standard': record.is_standard, - 'applicable_range': record.applicable_range, - 'image': record.image, - }) - # 删除缓存信息 + ('code', '=', self.functional_tool_code)]).sudo().write({ + 'code': record.code, + 'name': record.name, + 'mrs_cutting_tool_type_id': record.mrs_cutting_tool_type_id.id, + 'mrs_cutting_tool_model_id': record.mrs_cutting_tool_model_id.id, + 'cutting_tool_integral_model_id': record.cutting_tool_integral_model_id.id, + 'cutting_tool_blade_model_id': record.cutting_tool_blade_model_id.id, + 'cutting_tool_cutterbar_model_id': record.cutting_tool_cutterbar_model_id.id, + 'cutting_tool_cutterpad_model_id': record.cutting_tool_cutterpad_model_id.id, + 'cutting_tool_cutterhandle_model_id': record.cutting_tool_cutterhandle_model_id.id, + 'cutting_tool_cutterhead_model_id': record.cutting_tool_cutterhead_model_id.id, + 'diameter': record.diameter, + 'tool_grade': record.tool_grade, + 'machining_accuracy': record.machining_accuracy, + 'tool_length': record.tool_length, + 'blade_number': record.blade_number, + 'integral_blade_length': record.integral_blade_length, + 'effective_blade_length': record.effective_blade_length, + 'max_life': record.max_life, + 'is_standard': record.is_standard, + 'applicable_range': record.applicable_range, + 'image': record.image, + }) + # 删除功能刀具缓存信息 self.env['sf.functional.cutting.tool.entity.cache'].search([ ('code', '=', self.functional_tool_code)]).unlink() - # # 删除功能刀具预警、实时分布、出入库记录的新记录 - # self.env['sf.functional.tool.warning'].search([ - # ('code', '=', self.functional_tool_code)]).unlink() - # self.env['sf.real.time.distribution.of.functional.tools'].search([ - # ('code', '=', self.functional_tool_code)]).unlink() - # self.env['sf.inbound.and.outbound.records.of.functional.tools'].search([ - # ('code', '=', self.functional_tool_code)]).unlink() - # 修改功能刀具组装的组装信息 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', '=', '1') ]).write({ - 'mrs_cutting_tool_integral_model_ids': None, + 'cutting_tool_integral_model_id': None, 'integral_code': None, 'integral_name': None, 'sf_tool_brand_id_1': None, - 'mrs_cutting_tool_blade_model_ids': None, + 'cutting_tool_blade_model_id': None, 'blade_code': None, 'blade_name': None, 'sf_tool_brand_id_2': None, - 'mrs_cutting_tool_cutterbar_model_ids': None, + 'cutting_tool_cutterbar_model_id': None, 'bar_code': None, 'bar_name': None, 'sf_tool_brand_id_3': None, - 'mrs_cutting_tool_cutterpad_model_ids': None, + 'cutting_tool_cutterpad_model_id': None, 'pad_code': None, 'pad_name': None, 'sf_tool_brand_id_4': None, - 'mrs_cutting_tool_cutterhandle_model_ids': None, + 'cutting_tool_cutterhandle_model_id': None, 'handle_code': None, 'handle_name': None, 'sf_tool_brand_id_5': None, - 'mrs_cutting_tool_cutterhead_model_ids': None, + 'cutting_tool_cutterhead_model_id': None, 'chuck_code': None, 'chuck_name': None, 'sf_tool_brand_id_6': None, diff --git a/sf_tool_management/models/tool_material_search.py b/sf_tool_management/models/tool_material_search.py index 5917a097..b422d1bf 100644 --- a/sf_tool_management/models/tool_material_search.py +++ b/sf_tool_management/models/tool_material_search.py @@ -94,13 +94,21 @@ class SfToolMaterialSearch(models.Model): integral_run_out_accuracy_max = fields.Float('整体式刀具端跳精度max', digits=(6,1)) integral_run_out_accuracy_min = fields.Float('整体式刀具端跳精度min', digits=(6, 1)) - suitable_machining_method_ids = fields.Many2many('sf.suitable.machining.method', - 'rel_suitable_machining_method', '适合加工方式') - blade_tip_characteristics_ids = fields.Many2many('sf.blade.tip.characteristics', - 'rel_blade_tip_characteristics', '刀尖特征') - handle_type_ids = fields.Many2many('sf.handle.type', 'rel_handle_type', '柄部类型') - cutting_direction_ids = fields.Many2many('sf.cutting.direction', 'rel_cutting_direction', '走刀方向') - suitable_coolant_ids = fields.Many2many('sf.suitable.coolant', 'rel_suitable_coolant', '适合冷却液') + suitable_machining_method_ids = fields.Many2many('maintenance.equipment.image', + 'rel_machining_product_template_material_search', '适合加工方式', + domain=[('type', '=', '加工能力')]) + blade_tip_characteristics_ids = fields.Many2many('maintenance.equipment.image', + 'rel_blade_tip_product_template_material_search', '刀尖特征', + domain=[('type', '=', '刀尖特征')]) + handle_type_ids = fields.Many2many('maintenance.equipment.image', + 'rel_handle_product_template_material_search', '柄部类型', + domain=[('type', '=', '柄部类型')]) + cutting_direction_ids = fields.Many2many('maintenance.equipment.image', + 'rel_cutting_product_template_material_search', '走刀方向', + domain=[('type', '=', '走刀方向')]) + suitable_coolant_ids = fields.Many2many('maintenance.equipment.image', + 'rel_coolant_product_template_material_search', '适合冷却液', + domain=[('type', '=', '冷却液')]) cutting_speed_ids = fields.Many2many('sf.cutting.speed', string='切削速度Vc') feed_per_tooth_ids = fields.Many2many('sf.feed.per.tooth', 'rel_feed_per_tooth_ids', '每齿走刀量fz') diff --git a/sf_tool_management/security/ir.model.access.csv b/sf_tool_management/security/ir.model.access.csv index 855733b9..5a336eff 100644 --- a/sf_tool_management/security/ir.model.access.csv +++ b/sf_tool_management/security/ir.model.access.csv @@ -1,10 +1,10 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink access_sf_functional_cutting_tool_entity,sf.functional.cutting.tool.entity,model_sf_functional_cutting_tool_entity,base.group_user,1,1,1,1 access_sf_functional_cutting_tool_entity_cache,sf.functional.cutting.tool.entity.cache,model_sf_functional_cutting_tool_entity_cache,base.group_user,1,1,1,1 -access_sf.functional.tool.warning,sf.functional.tool.warning,model_sf_functional_tool_warning,base.group_user,1,1,1,1 -access_sf.real.time.distribution.of.functional.tools,sf.real.time.distribution.of.functional.tools,model_sf_real_time_distribution_of_functional_tools,base.group_user,1,1,1,1 -access_sf.inbound.and.outbound.records.of.functional.tools,sf.inbound.and.outbound.records.of.functional.tools,model_sf_inbound_and_outbound_records_of_functional_tools,base.group_user,1,1,1,1 -access_sf.inbound.and.outbound.records,sf.inbound.and.outbound.records,model_sf_inbound_and_outbound_records,base.group_user,1,1,1,1 +access_sf_functional_tool_warning,sf.functional.tool.warning,model_sf_functional_tool_warning,base.group_user,1,1,1,1 +access_sf_real_time_distribution_of_functional_tools,sf.real.time.distribution.of.functional.tools,model_sf_real_time_distribution_of_functional_tools,base.group_user,1,1,1,1 +access_sf_inbound_and_outbound_records_of_functional_tools,sf.inbound.and.outbound.records.of.functional.tools,model_sf_inbound_and_outbound_records_of_functional_tools,base.group_user,1,1,1,1 +access_sf_inbound_and_outbound_records,sf.inbound.and.outbound.records,model_sf_inbound_and_outbound_records,base.group_user,1,1,1,1 access_sf_cam_work_order_program_knife_plan,sf.cam.work.order.program.knife.plan,model_sf_cam_work_order_program_knife_plan,base.group_user,1,1,1,1 access_sf_machine_table_tool_changing_apply,sf.machine.table.tool.changing.apply,model_sf_machine_table_tool_changing_apply,base.group_user,1,1,1,1 diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml index d79239f2..eba023b2 100644 --- a/sf_tool_management/views/tool_base_views.xml +++ b/sf_tool_management/views/tool_base_views.xml @@ -6,16 +6,16 @@ sf.functional.cutting.tool.entity.list.tree sf.functional.cutting.tool.entity - + - - - - - - + + + + + + @@ -25,7 +25,7 @@ sf.functional.cutting.tool.entity.list.form sf.functional.cutting.tool.entity -
+

@@ -37,32 +37,26 @@ - - - - - - + + @@ -98,6 +92,30 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -131,12 +149,12 @@ - - - - - - + + + + + + @@ -157,16 +175,16 @@ sf.functional.tool.warning.tree sf.functional.tool.warning - + - - - - - - + + + + + + @@ -184,7 +202,7 @@ sf.functional.tool.warning.form sf.functional.tool.warning - +

@@ -196,61 +214,26 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -316,12 +299,12 @@ - - - - - - + + + + + + @@ -351,17 +334,17 @@ 功能刀具实时分布 sf.real.time.distribution.of.functional.tools - + - - - - - - + + + + + + @@ -381,7 +364,7 @@ 功能刀具实时分布 sf.real.time.distribution.of.functional.tools - +

@@ -393,61 +376,26 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -517,12 +465,12 @@ - - - - - - + + + + + + @@ -544,16 +492,16 @@ 功能刀具出入库记录 sf.inbound.and.outbound.records.of.functional.tools - + - - - - - - + + + + + + @@ -566,7 +514,7 @@ 功能刀具出入库记录 sf.inbound.and.outbound.records.of.functional.tools - +

@@ -578,61 +526,26 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -695,12 +608,12 @@ - - - - - - + + + + + + @@ -1155,17 +1068,21 @@ attrs="{'invisible': [('assemble_status', '!=', '0')]}" class="btn-primary"/> -

- +
+ + +
+
+ +
@@ -349,7 +357,7 @@

From a5384772724daa29a8c536fd3c2724c836a0ab59 Mon Sep 17 00:00:00 2001 From: yuxianghui <1608204036@qq.com> Date: Mon, 25 Sep 2023 13:43:08 +0800 Subject: [PATCH 10/11] =?UTF-8?q?1=E3=80=81=E8=AE=A1=E5=88=92=E7=AE=A1?= =?UTF-8?q?=E7=90=86-=E4=BA=A7=E7=BA=BF=E8=AE=BE=E5=A4=87=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E8=AE=BE=E7=BD=AE=E6=A8=A1=E5=9D=97=E4=BC=98=E5=8C=96?= =?UTF-8?q?=EF=BC=8C=E5=B7=A5=E4=BD=9C=E6=97=A5=E5=8E=86=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=BC=98=E5=8C=96=EF=BC=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=8F=90=E7=A4=BA=EF=BC=9B2=E3=80=81?= =?UTF-8?q?=E5=88=80=E5=85=B7=E7=AE=A1=E7=90=86-=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=88=80=E5=85=B7=E7=BB=84=E8=A3=85=E3=80=81=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E3=80=81=E9=A2=84=E8=AD=A6=E3=80=81=E5=AE=9E=E6=97=B6=E5=88=86?= =?UTF-8?q?=E5=B8=83=E3=80=81=E5=87=BA=E5=85=A5=E5=BA=93=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=92=8C=E7=BB=84=E8=A3=85=E7=95=8C=E9=9D=A2=E7=9A=84=E5=88=80?= =?UTF-8?q?=E5=85=B7=E7=89=A9=E6=96=99=E5=AD=97=E6=AE=B5=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E6=9B=B4=E6=94=B9=E4=B8=BA=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E4=B8=8B=E7=9A=84=E5=88=80=E5=85=B7=E7=89=A9=E6=96=99=EF=BC=9B?= =?UTF-8?q?3=E3=80=81=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7=E7=BB=84?= =?UTF-8?q?=E8=A3=85-=E7=BB=84=E8=A3=85=E7=95=8C=E9=9D=A2=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E9=80=89=E6=8B=A9=E6=8F=90=E7=A4=BA=EF=BC=8C4?= =?UTF-8?q?=E3=80=81=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=B8=8B=E7=9A=84=E8=83=BD=E5=8A=9B=E5=8F=82=E6=95=B0=E5=AF=B9?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E9=80=89=E6=8B=A9=E7=9A=84=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E4=B8=8D=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_plan_management/models/base.py | 54 ++++--- sf_plan_management/models/calendar_base.py | 4 +- sf_plan_management/views/plan_base_view.xml | 24 ++-- sf_tool_management/models/base.py | 144 +++++++++---------- sf_tool_management/views/tool_base_views.xml | 17 ++- sf_tool_management/wizard/wizard.py | 36 ++--- sf_tool_management/wizard/wizard_view.xml | 14 +- 7 files changed, 146 insertions(+), 147 deletions(-) diff --git a/sf_plan_management/models/base.py b/sf_plan_management/models/base.py index 097401ad..dffc0ef6 100644 --- a/sf_plan_management/models/base.py +++ b/sf_plan_management/models/base.py @@ -8,48 +8,42 @@ class ProcedureEquipmentResourceSetting(models.Model): name = fields.Many2one('sf.production.line', string='生产线', required=True) work_center_name_id = fields.Many2one('mrp.workcenter', string='工作中心名称') - equipment_code = fields.Char(string='机台号', readonly=True, compute='_onchange_equipment_name_id') - equipment_name_id = fields.Many2one('maintenance.equipment', - string='设备名称', - readonly=True, - compute='_onchange_work_center_name_id') - brand = fields.Char(string='品牌', readonly=True, compute='_onchange_equipment_name_id') - model = fields.Char(string='型号', readonly=True, compute='_onchange_equipment_name_id') + equipment_name_id = fields.Many2one('maintenance.equipment', string='设备名称', readonly=True, search=True, + compute='_compute_equipment_name_id') + equipment_code = fields.Char(string='机台号', readonly=True, related='equipment_name_id.code') + brand_id = fields.Many2one('sf.machine.brand', string='品牌', readonly=True, related='equipment_name_id.brand_id') + type_id = fields.Many2one('sf.machine_tool.type', string='型号', readonly=True, related='equipment_name_id.type_id') + status = fields.Selection(string='设备状态', readonly=True, related='equipment_name_id.state') # todo 传入工序数据 working_procedure = fields.Char(string='工序', readonly=True) production_capacity = fields.Float(string='产能', required=True, digits=(4, 1)) working_calendar_id = fields.Many2one('sf.work.log.setting', string='工作日历') - working_shift_id = fields.Many2many('sf.working.shift', string='班次', readonly=True, compute='_onchange_working_calendar_id') + working_shift_id = fields.Many2many('sf.working.shift', string='班次', readonly=True, + compute='_compute_working_shift_id') create_time = fields.Datetime(string='新增时间', default=lambda self: fields.Datetime.now(), readonly=True) - status = fields.Selection([('正常', '正常'), ('1', '故障停机'), ('2', '计划停机')], - string='设备状态', - readonly=True, - compute='_onchange_equipment_name_id') participate_in_scheduling = fields.Boolean(string='参与排程', default=True) - @api.onchange('production_capacity') - def _onchange_production_capacity(self): + @api.depends('work_center_name_id') + def _compute_equipment_name_id(self): + for record in self: + if record.work_center_name_id: + record.equipment_name_id = record.work_center_name_id.equipment_id + else: + record.equipment_name_id = None + + @api.constrains('production_capacity') + def _check_production_capacity(self): for record in self: if record.production_capacity < 0: - raise UserError("输入的产能值不正确，请重新输入！") - - @api.depends('work_center_name_id') - def _onchange_work_center_name_id(self): - for record in self: - record.equipment_name_id = record.work_center_name_id.equipment_id - - @api.onchange('equipment_name_id') - def _onchange_equipment_name_id(self): - for record in self: - record.equipment_code = record.equipment_name_id.code - record.brand = record.equipment_name_id.brand_id.name - record.model = record.equipment_name_id.type_id.name - record.status = record.equipment_name_id.state + raise UserError("产能不能为负！") @api.depends('working_calendar_id') - def _onchange_working_calendar_id(self): + def _compute_working_shift_id(self): for record in self: - record.working_shift_id = record.working_calendar_id.working_shift_ids + if record.working_calendar_id: + record.working_shift_id = record.working_calendar_id.working_shift_ids + else: + record.working_shift_id = None diff --git a/sf_plan_management/models/calendar_base.py b/sf_plan_management/models/calendar_base.py index 95fb6342..b493053d 100644 --- a/sf_plan_management/models/calendar_base.py +++ b/sf_plan_management/models/calendar_base.py @@ -256,7 +256,7 @@ class WorkScheduleCalendar(models.Model): name = fields.Selection([('休息日', '休息日'), ('计划停机', '计划停机'), ('工作日', '工作日')], '日历事件名称') date_time = fields.Date('休息时间') name_id = fields.Many2one('sf.work.log.setting', '工作日历名称') - calendar_code = fields.Char('工作日历编码', readonly=True, compute='_compute_name_id') + calendar_code = fields.Char('工作日历编码', readonly=True, compute='_compute_calendar_code') day_off_id = fields.Many2many('sf.day.off', string='休息日') scheduled_outage = fields.Char('计划停机') @@ -266,7 +266,7 @@ class WorkScheduleCalendar(models.Model): annual_planned_downtime = fields.Char('年计划停机时长', readonly=True) @api.depends('name_id') - def _compute_name_id(self): + def _compute_calendar_code(self): for record in self: if record: record.calendar_code = record.name_id.code diff --git a/sf_plan_management/views/plan_base_view.xml b/sf_plan_management/views/plan_base_view.xml index 8cd6c450..06464b98 100644 --- a/sf_plan_management/views/plan_base_view.xml +++ b/sf_plan_management/views/plan_base_view.xml @@ -47,7 +47,7 @@ - @@ -101,8 +101,8 @@ - - + + @@ -211,8 +211,8 @@ - - + + @@ -233,14 +233,14 @@

- +

- + - + @@ -254,12 +254,12 @@ ` - + - + @@ -277,8 +277,8 @@ - - + + diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py index 5625aab6..9ed661ee 100644 --- a/sf_tool_management/models/base.py +++ b/sf_tool_management/models/base.py @@ -24,28 +24,28 @@ class FunctionalCuttingToolEntity(models.Model): return categories.browse(mrs_cutting_tool_type_ids) # 整体式刀具型号 - cutting_tool_integral_model_id = fields.Many2one('sf.tool.material.search', string='整体式刀具型号', readonly=True, - domain=[('cutting_tool_type', '=', '整体式刀具')]) + cutting_tool_integral_model_id = fields.Many2one('product.product', string='整体式刀具型号', readonly=True, + domain=[('cutting_tool_material_id', '=', '整体式刀具')]) # 刀片型号 - cutting_tool_blade_model_id = fields.Many2one('sf.tool.material.search', string='刀片型号', readonly=True, - domain=[('cutting_tool_type', '=', '刀片')]) + cutting_tool_blade_model_id = fields.Many2one('product.product', string='刀片型号', readonly=True, + domain=[('cutting_tool_material_id', '=', '刀片')]) # 刀杆型号 - cutting_tool_cutterbar_model_id = fields.Many2one('sf.tool.material.search', string='刀杆型号', readonly=True, - domain=[('cutting_tool_type', '=', '刀杆')]) + cutting_tool_cutterbar_model_id = fields.Many2one('product.product', string='刀杆型号', readonly=True, + domain=[('cutting_tool_material_id', '=', '刀杆')]) # 刀盘型号 - cutting_tool_cutterpad_model_id = fields.Many2one('sf.tool.material.search', string='刀盘型号', readonly=True, - domain=[('cutting_tool_type', '=', '刀盘')]) + cutting_tool_cutterpad_model_id = fields.Many2one('product.product', string='刀盘型号', readonly=True, + domain=[('cutting_tool_material_id', '=', '刀盘')]) # 刀柄型号 - cutting_tool_cutterhandle_model_id = fields.Many2one('sf.tool.material.search', string='刀柄型号', readonly=True, - domain=[('cutting_tool_type', '=', '刀柄')]) + cutting_tool_cutterhandle_model_id = fields.Many2one('product.product', string='刀柄型号', readonly=True, + domain=[('cutting_tool_material_id', '=', '刀柄')]) # 夹头型号 - cutting_tool_cutterhead_model_id = fields.Many2one('sf.tool.material.search', string='夹头型号', readonly=True, - domain=[('cutting_tool_type', '=', '夹头')]) + 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')], @@ -103,28 +103,28 @@ class FunctionalCuttingToolEntityCache(models.Model): mrs_cutting_tool_model_id = fields.Many2one('sf.cutting.tool.model', string='刀具型号') # 整体式刀具型号 - cutting_tool_integral_model_id = fields.Many2one('sf.tool.material.search', string='整体式刀具型号', readonly=True, - domain=[('cutting_tool_type', '=', '整体式刀具')]) + cutting_tool_integral_model_id = fields.Many2one('product.product', string='整体式刀具型号', readonly=True, + domain=[('cutting_tool_material_id', '=', '整体式刀具')]) # 刀片型号 - cutting_tool_blade_model_id = fields.Many2one('sf.tool.material.search', string='刀片型号', readonly=True, - domain=[('cutting_tool_type', '=', '刀片')]) + cutting_tool_blade_model_id = fields.Many2one('product.product', string='刀片型号', readonly=True, + domain=[('cutting_tool_material_id', '=', '刀片')]) # 刀杆型号 - cutting_tool_cutterbar_model_id = fields.Many2one('sf.tool.material.search', string='刀杆型号', readonly=True, - domain=[('cutting_tool_type', '=', '刀杆')]) + cutting_tool_cutterbar_model_id = fields.Many2one('product.product', string='刀杆型号', readonly=True, + domain=[('cutting_tool_material_id', '=', '刀杆')]) # 刀盘型号 - cutting_tool_cutterpad_model_id = fields.Many2one('sf.tool.material.search', string='刀盘型号', readonly=True, - domain=[('cutting_tool_type', '=', '刀盘')]) + cutting_tool_cutterpad_model_id = fields.Many2one('product.product', string='刀盘型号', readonly=True, + domain=[('cutting_tool_material_id', '=', '刀盘')]) # 刀柄型号 - cutting_tool_cutterhandle_model_id = fields.Many2one('sf.tool.material.search', string='刀柄型号', readonly=True, - domain=[('cutting_tool_type', '=', '刀柄')]) + cutting_tool_cutterhandle_model_id = fields.Many2one('product.product', string='刀柄型号', readonly=True, + domain=[('cutting_tool_material_id', '=', '刀柄')]) # 夹头型号 - cutting_tool_cutterhead_model_id = fields.Many2one('sf.tool.material.search', string='夹头型号', readonly=True, - domain=[('cutting_tool_type', '=', '夹头')]) + 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')], @@ -153,33 +153,33 @@ class FunctionalToolWarning(models.Model): related='functional_cutting_tool_id.mrs_cutting_tool_type_id') # 整体式刀具型号 - cutting_tool_integral_model_id = fields.Many2one('sf.tool.material.search', string='整体式刀具型号', readonly=True, - domain=[('cutting_tool_type', '=', '整体式刀具')], + 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('sf.tool.material.search', string='刀片型号', readonly=True, - domain=[('cutting_tool_type', '=', '刀片')], + 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('sf.tool.material.search', string='刀杆型号', readonly=True, - domain=[('cutting_tool_type', '=', '刀杆')], + 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('sf.tool.material.search', string='刀盘型号', readonly=True, - domain=[('cutting_tool_type', '=', '刀盘')], + 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('sf.tool.material.search', string='刀柄型号', readonly=True, - domain=[('cutting_tool_type', '=', '刀柄')], + 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('sf.tool.material.search', string='夹头型号', readonly=True, - domain=[('cutting_tool_type', '=', '夹头')], + 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') @@ -267,33 +267,33 @@ class RealTimeDistributionOfFunctionalTools(models.Model): # related='functional_cutting_tool_id.mrs_cutting_tool_type_id') # 整体式刀具型号 - cutting_tool_integral_model_id = fields.Many2one('sf.tool.material.search', string='整体式刀具型号', readonly=True, - domain=[('cutting_tool_type', '=', '整体式刀具')], + 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('sf.tool.material.search', string='刀片型号', readonly=True, - domain=[('cutting_tool_type', '=', '刀片')], + 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('sf.tool.material.search', string='刀杆型号', readonly=True, - domain=[('cutting_tool_type', '=', '刀杆')], + 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('sf.tool.material.search', string='刀盘型号', readonly=True, - domain=[('cutting_tool_type', '=', '刀盘')], + 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('sf.tool.material.search', string='刀柄型号', readonly=True, - domain=[('cutting_tool_type', '=', '刀柄')], + 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('sf.tool.material.search', string='夹头型号', readonly=True, - domain=[('cutting_tool_type', '=', '夹头')], + 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') @@ -375,33 +375,33 @@ class InboundAndOutboundRecordsOfFunctionalTools(models.Model): name = fields.Char('名称', invisible=True, readonly=True, related='functional_cutting_tool_id.name') # 整体式刀具型号 - cutting_tool_integral_model_id = fields.Many2one('sf.tool.material.search', string='整体式刀具型号', readonly=True, - domain=[('cutting_tool_type', '=', '整体式刀具')], + 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('sf.tool.material.search', string='刀片型号', readonly=True, - domain=[('cutting_tool_type', '=', '刀片')], + 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('sf.tool.material.search', string='刀杆型号', readonly=True, - domain=[('cutting_tool_type', '=', '刀杆')], + 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('sf.tool.material.search', string='刀盘型号', readonly=True, - domain=[('cutting_tool_type', '=', '刀盘')], + 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('sf.tool.material.search', string='刀柄型号', readonly=True, - domain=[('cutting_tool_type', '=', '刀柄')], + 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('sf.tool.material.search', string='夹头型号', readonly=True, - domain=[('cutting_tool_type', '=', '夹头')], + 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') @@ -752,39 +752,39 @@ class FunctionalToolAssembly(models.Model): functional_tool_cutting_type = fields.Char(string='功能刀具切削类型', readonly=False) # 整体式刀具型号 - cutting_tool_integral_model_id = fields.Many2one('sf.tool.material.search', string='整体式刀具型号', readonly=True, - domain=[('cutting_tool_type', '=', '整体式刀具')]) + cutting_tool_integral_model_id = fields.Many2one('product.product', string='整体式刀具型号', readonly=True, + domain=[('cutting_tool_material_id', '=', '整体式刀具')]) integral_code = fields.Char('整体式刀具序列号', readonly=True) integral_name = fields.Char('整体式刀具名称', readonly=True) sf_tool_brand_id_1 = fields.Many2one('sf.machine.brand', '整体式刀具品牌', readonly=True) # 刀片型号 - cutting_tool_blade_model_id = fields.Many2one('sf.tool.material.search', string='刀片型号', readonly=True, - domain=[('cutting_tool_type', '=', '刀片')]) + cutting_tool_blade_model_id = fields.Many2one('product.product', string='刀片型号', readonly=True, + domain=[('cutting_tool_material_id', '=', '刀片')]) blade_code = fields.Char('刀片序列号', readonly=True) blade_name = fields.Char('刀片名称', readonly=True) sf_tool_brand_id_2 = fields.Many2one('sf.machine.brand', '刀片品牌', readonly=True) # 刀杆型号 - cutting_tool_cutterbar_model_id = fields.Many2one('sf.tool.material.search', string='刀杆型号', readonly=True, - domain=[('cutting_tool_type', '=', '刀杆')]) + cutting_tool_cutterbar_model_id = fields.Many2one('product.product', string='刀杆型号', readonly=True, + domain=[('cutting_tool_material_id', '=', '刀杆')]) bar_code = fields.Char('刀杆序列号', readonly=True) bar_name = fields.Char('刀杆名称', readonly=True) sf_tool_brand_id_3 = fields.Many2one('sf.machine.brand', '刀杆品牌', readonly=True) # 刀盘型号 - cutting_tool_cutterpad_model_id = fields.Many2one('sf.tool.material.search', string='刀盘型号', readonly=True, - domain=[('cutting_tool_type', '=', '刀盘')]) + cutting_tool_cutterpad_model_id = fields.Many2one('product.product', string='刀盘型号', readonly=True, + domain=[('cutting_tool_material_id', '=', '刀盘')]) pad_code = fields.Char('刀盘序列号', readonly=True) pad_name = fields.Char('刀盘名称', readonly=True) sf_tool_brand_id_4 = fields.Many2one('sf.machine.brand', '刀盘品牌', readonly=True) # 刀柄型号 - cutting_tool_cutterhandle_model_id = fields.Many2one('sf.tool.material.search', string='刀柄型号', readonly=True, - domain=[('cutting_tool_type', '=', '刀柄')]) + cutting_tool_cutterhandle_model_id = fields.Many2one('product.product', string='刀柄型号', readonly=True, + domain=[('cutting_tool_material_id', '=', '刀柄')]) handle_code = fields.Char('刀柄序列号', readonly=True) handle_name = fields.Char('刀柄名称', readonly=True) sf_tool_brand_id_5 = fields.Many2one('sf.machine.brand', '刀柄品牌', readonly=True) # 夹头型号 - cutting_tool_cutterhead_model_id = fields.Many2one('sf.tool.material.search', string='夹头型号', readonly=True, - domain=[('cutting_tool_type', '=', '夹头')]) + cutting_tool_cutterhead_model_id = fields.Many2one('product.product', string='夹头型号', readonly=True, + domain=[('cutting_tool_material_id', '=', '夹头')]) chuck_code = fields.Char('夹头序列号', readonly=True) chuck_name = fields.Char('夹头名称', readonly=True) sf_tool_brand_id_6 = fields.Many2one('sf.machine.brand', '夹头品牌', readonly=True) diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml index eba023b2..aba086ca 100644 --- a/sf_tool_management/views/tool_base_views.xml +++ b/sf_tool_management/views/tool_base_views.xml @@ -95,24 +95,27 @@ - + - + - + - + - + diff --git a/sf_tool_management/wizard/wizard.py b/sf_tool_management/wizard/wizard.py index c33df86c..37f39760 100644 --- a/sf_tool_management/wizard/wizard.py +++ b/sf_tool_management/wizard/wizard.py @@ -137,8 +137,8 @@ class FunctionalToolAssemblyOrder(models.TransientModel): # 功能刀具组装信息 # 整体式刀具型号 - cutting_tool_integral_model_id = fields.Many2one('sf.tool.material.search', string='整体式刀具型号', readonly=False, - domain=[('cutting_tool_type', '=', '整体式刀具')]) + cutting_tool_integral_model_id = fields.Many2one('product.product', string='整体式刀具型号', readonly=False, + domain=[('cutting_tool_material_id', '=', '整体式刀具')]) integral_code = fields.Char('整体式刀具序列号', readonly=True, compute='_compute_integral_code') integral_name = fields.Char('整体式刀具名称', readonly=True, compute='_compute_integral_name') sf_tool_brand_id_1 = fields.Many2one('sf.machine.brand', '整体式刀具品牌', readonly=True, @@ -164,13 +164,13 @@ class FunctionalToolAssemblyOrder(models.TransientModel): def _compute_sf_tool_brand_id_1(self): for record in self: if record.cutting_tool_integral_model_id: - self.sf_tool_brand_id_1 = record.cutting_tool_integral_model_id.mrs_machine_brand_id.id + self.sf_tool_brand_id_1 = record.cutting_tool_integral_model_id.brand_id.id else: self.sf_tool_brand_id_1 = None # 刀片型号 - cutting_tool_blade_model_id = fields.Many2one('sf.tool.material.search', string='刀片型号', readonly=False, - domain=[('cutting_tool_type', '=', '刀片')]) + cutting_tool_blade_model_id = fields.Many2one('product.product', string='刀片型号', readonly=False, + domain=[('cutting_tool_material_id', '=', '刀片')]) blade_code = fields.Char('刀片序列号', readonly=True, compute='_compute_blade_code') blade_name = fields.Char('刀片名称', readonly=True, compute='_compute_blade_name') sf_tool_brand_id_2 = fields.Many2one('sf.machine.brand', '刀片品牌', readonly=True, @@ -196,13 +196,13 @@ class FunctionalToolAssemblyOrder(models.TransientModel): def _compute_sf_tool_brand_id_2(self): for record in self: if record.cutting_tool_blade_model_id: - self.sf_tool_brand_id_2 = self.cutting_tool_blade_model_id.mrs_machine_brand_id.id + self.sf_tool_brand_id_2 = self.cutting_tool_blade_model_id.brand_id.id else: self.sf_tool_brand_id_2 = None # 刀杆型号 - cutting_tool_cutterbar_model_id = fields.Many2one('sf.tool.material.search', string='刀杆型号', readonly=False, - domain=[('cutting_tool_type', '=', '刀杆')]) + cutting_tool_cutterbar_model_id = fields.Many2one('product.product', string='刀杆型号', readonly=False, + domain=[('cutting_tool_material_id', '=', '刀杆')]) bar_code = fields.Char('刀杆序列号', readonly=True, compute='_compute_bar_code') bar_name = fields.Char('刀杆名称', readonly=True, compute='_compute_bar_name') sf_tool_brand_id_3 = fields.Many2one('sf.machine.brand', '刀杆品牌', readonly=True, @@ -228,13 +228,13 @@ class FunctionalToolAssemblyOrder(models.TransientModel): def _compute_sf_tool_brand_id_3(self): for record in self: if record.cutting_tool_cutterbar_model_id: - self.sf_tool_brand_id_3 = self.cutting_tool_cutterbar_model_id.mrs_machine_brand_id.id + self.sf_tool_brand_id_3 = self.cutting_tool_cutterbar_model_id.brand_id.id else: self.sf_tool_brand_id_3 = None # 刀盘型号 - cutting_tool_cutterpad_model_id = fields.Many2one('sf.tool.material.search', string='刀盘型号', readonly=False, - domain=[('cutting_tool_type', '=', '刀盘')]) + cutting_tool_cutterpad_model_id = fields.Many2one('product.product', string='刀盘型号', readonly=False, + domain=[('cutting_tool_material_id', '=', '刀盘')]) pad_code = fields.Char('刀盘序列号', readonly=True, compute='_compute_pad_code') pad_name = fields.Char('刀盘名称', readonly=True, compute='_compute_pad_name') sf_tool_brand_id_4 = fields.Many2one('sf.machine.brand', '刀盘品牌', readonly=True, @@ -260,13 +260,13 @@ class FunctionalToolAssemblyOrder(models.TransientModel): def _compute_sf_tool_brand_id_4(self): for record in self: if record.cutting_tool_cutterpad_model_id: - self.sf_tool_brand_id_4 = self.cutting_tool_cutterpad_model_id.mrs_machine_brand_id.id + self.sf_tool_brand_id_4 = self.cutting_tool_cutterpad_model_id.brand_id.id else: self.sf_tool_brand_id_4 = None # 刀柄型号 - cutting_tool_cutterhandle_model_id = fields.Many2one('sf.tool.material.search', string='刀柄型号', readonly=False, - domain=[('cutting_tool_type', '=', '刀柄')]) + cutting_tool_cutterhandle_model_id = fields.Many2one('product.product', string='刀柄型号', readonly=False, + domain=[('cutting_tool_material_id', '=', '刀柄')]) handle_code = fields.Char('刀柄序列号', readonly=True, compute='_compute_handle_code') handle_name = fields.Char('刀柄名称', readonly=True, compute='_compute_handle_name') sf_tool_brand_id_5 = fields.Many2one('sf.machine.brand', '刀柄品牌', readonly=True, @@ -292,13 +292,13 @@ class FunctionalToolAssemblyOrder(models.TransientModel): def _compute_sf_tool_brand_id_5(self): for record in self: if record.cutting_tool_cutterhandle_model_id: - self.sf_tool_brand_id_5 = self.cutting_tool_cutterhandle_model_id.mrs_machine_brand_id.id + self.sf_tool_brand_id_5 = self.cutting_tool_cutterhandle_model_id.brand_id.id else: self.sf_tool_brand_id_5 = None # 夹头型号 - cutting_tool_cutterhead_model_id = fields.Many2one('sf.tool.material.search', string='夹头型号', readonly=False, - domain=[('cutting_tool_type', '=', '夹头')]) + cutting_tool_cutterhead_model_id = fields.Many2one('product.product', string='夹头型号', readonly=False, + domain=[('cutting_tool_material_id', '=', '夹头')]) chuck_code = fields.Char('夹头序列号', readonly=True, compute='_compute_chuck_code') chuck_name = fields.Char('夹头名称', readonly=True, compute='_compute_chuck_name') sf_tool_brand_id_6 = fields.Many2one('sf.machine.brand', '夹头品牌', readonly=True, @@ -324,7 +324,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel): def _compute_sf_tool_brand_id_6(self): for record in self: if record.cutting_tool_cutterhead_model_id: - self.sf_tool_brand_id_6 = self.cutting_tool_cutterhead_model_id.mrs_machine_brand_id.id + self.sf_tool_brand_id_6 = self.cutting_tool_cutterhead_model_id.brand_id.id else: self.sf_tool_brand_id_6 = None diff --git a/sf_tool_management/wizard/wizard_view.xml b/sf_tool_management/wizard/wizard_view.xml index 7f4c175d..6398b362 100644 --- a/sf_tool_management/wizard/wizard_view.xml +++ b/sf_tool_management/wizard/wizard_view.xml @@ -143,28 +143,30 @@ - + - + From aba664375f3488ba167c6105b3524aefe0ba5236 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?WEB=E8=AE=B8=E4=BD=95=E5=93=B2=5Cxuhez?= Date: Mon, 25 Sep 2023 15:10:50 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E8=A1=A8=E5=A4=B4=E5=9B=BA=E5=AE=9Abug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jikimo_frontend/static/src/scss/custom_style.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jikimo_frontend/static/src/scss/custom_style.scss b/jikimo_frontend/static/src/scss/custom_style.scss index 3237fc2b..427ca93c 100644 --- a/jikimo_frontend/static/src/scss/custom_style.scss +++ b/jikimo_frontend/static/src/scss/custom_style.scss @@ -161,7 +161,7 @@ td.o_required_modifier { .o_list_view .o_list_table thead { position: sticky; top: 0; - z-index: 100000; + //z-index: 100000; } //.o_list_view .o_list_table { @@ -174,7 +174,7 @@ td.o_required_modifier { .o_form_view.o_xxl_form_view .o_form_sheet_bg > .o_form_statusbar { position: sticky !important; top: 0; - z-index: 100000; + //z-index: 100000; } //----------------------------------------------------------- @@ -274,13 +274,13 @@ div[class="o_content o_component_with_search_panel"] .o_kanban_primary_right > . // flex-direction: column; //} -.o_kanban_renderer .o_kanban_record .o_kanban_record_bottom>div:nth-child(1)>span:nth-child(1) { +.o_kanban_renderer .o_kanban_record .o_kanban_record_bottom > div:nth-child(1) > span:nth-child(1) { display: inline-block; margin-right: 10px; } -.o_kanban_renderer .o_kanban_record .o_kanban_record_bottom>div:nth-child(1) { +.o_kanban_renderer .o_kanban_record .o_kanban_record_bottom > div:nth-child(1) { margin-top: -5px; margin-bottom: 5px; }