From 39f97131a29e0e3e1360c8ce0b4fcaf02d4c9dd1 Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Wed, 25 Oct 2023 15:07:29 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=8E=BB=E6=8E=89=E4=B8=8D=E8=A6=81=E7=9A=84?= =?UTF-8?q?=E4=BB=A3=E7=A0=812,.=E4=BA=A7=E5=93=81=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A7=84=E6=A0=BC=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_base/models/tool_other_features.py | 23 +- sf_base/views/tool_views.xml | 12 +- sf_dlm/views/product_template_view.xml | 21 +- sf_manufacturing/__init__.py | 2 +- sf_manufacturing/__manifest__.py | 1 - sf_manufacturing/models/product_template.py | 4 +- sf_manufacturing/security/ir.model.access.csv | 1 - sf_manufacturing/wizard/__init__.py | 3 - .../cutting_tool_specification_wizard.py | 125 -------- .../cutting_tool_specification_wizard.xml | 266 ------------------ 10 files changed, 31 insertions(+), 427 deletions(-) delete mode 100644 sf_manufacturing/wizard/__init__.py delete mode 100644 sf_manufacturing/wizard/cutting_tool_specification_wizard.py delete mode 100644 sf_manufacturing/wizard/cutting_tool_specification_wizard.xml diff --git a/sf_base/models/tool_other_features.py b/sf_base/models/tool_other_features.py index 16b31433..e4376d63 100644 --- a/sf_base/models/tool_other_features.py +++ b/sf_base/models/tool_other_features.py @@ -5,13 +5,13 @@ class ToolMaterialsBasicParameters(models.Model): _name = 'sf.tool.materials.basic.parameters' _description = '刀具物料基本参数' + name = fields.Char('物料号', size=50) standard_library_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀具标准库') - specification_id = fields.Many2one('sf.cutting_tool.specification.wizard', string='刀具规格') cutting_tool_type = fields.Char(related='standard_library_id.cutting_tool_type', string='刀具物料类型', store=True) # 整体式刀具参数 - code = fields.Char('物料号', size=50) + # code = fields.Char('物料号', size=50) total_length = fields.Char('总长度(mm)', size=20) blade_number = fields.Selection( [('2', '2'), ('3', '3'), ('4', '4'), ('5', '5'), ('6', '6'), ('7', '7'), ('8', '8')], @@ -123,10 +123,15 @@ class ToolMaterialsBasicParameters(models.Model): string='适用刀柄型号' ) + def name_get(self): + res = [] + for obj in self: + res.append((obj.id, obj.blade_diameter)) + return res + def _json_integral_tool_basic_param(self, obj): integral_tool_basic_param_str = (0, '', { - 'standard_library_id': 1, - 'code': obj['code'], + 'name': obj['code'], 'cutting_tool_type': obj['cutting_tool_type'], 'total_length': obj['total_length'], 'blade_diameter': obj['blade_diameter'], @@ -149,7 +154,7 @@ class ToolMaterialsBasicParameters(models.Model): def _json_blade_basic_param(self, obj): blade_basic_param_str = (0, '', { - 'code': obj['code'], + 'name': obj['code'], 'cutting_tool_type': obj['cutting_tool_type'], 'length': obj['length'], 'thickness': obj['thickness'], @@ -179,7 +184,7 @@ class ToolMaterialsBasicParameters(models.Model): def _json_cutter_arbor_basic_param(self, obj): cutter_arbor_basic_param_str = (0, '', { - 'code': obj['code'], + 'name': obj['code'], 'cutting_tool_type': obj['cutting_tool_type'], 'height': obj['height'], 'width': obj['width'], @@ -210,7 +215,7 @@ class ToolMaterialsBasicParameters(models.Model): def _json_cutter_head_basic_param(self, obj): cutter_head_basic_param_str = (0, '', { - 'code': obj['code'], + 'name': obj['code'], 'cutting_tool_type': obj['cutting_tool_type'], 'install_blade_tip_num': obj['install_blade_tip_num'], 'blade_diameter': obj['blade_diameter'], @@ -233,7 +238,7 @@ class ToolMaterialsBasicParameters(models.Model): def _json_knife_handle_basic_param(self, obj): knife_handle_basic_param_str = (0, '', { - 'code': obj['code'], + 'name': obj['code'], 'cutting_tool_type': obj['cutting_tool_type'], 'total_length': obj['total_length'], 'flange_shank_length': obj['flange_shank_length'], @@ -261,7 +266,7 @@ class ToolMaterialsBasicParameters(models.Model): def _json_chuck_basic_param(self, obj): chuck_basic_param_str = (0, '', { - 'code': obj['code'], + 'name': obj['code'], 'cutting_tool_type': obj['cutting_tool_type'], 'er_size_model': obj['er_size_model'], 'min_clamping_diameter': obj['min_clamping_diameter'], diff --git a/sf_base/views/tool_views.xml b/sf_base/views/tool_views.xml index bc1c9605..bfaac129 100644 --- a/sf_base/views/tool_views.xml +++ b/sf_base/views/tool_views.xml @@ -255,7 +255,7 @@ attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"> - + @@ -279,7 +279,7 @@ attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"> - + @@ -309,7 +309,7 @@ attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')]}"> - + @@ -340,7 +340,7 @@ attrs="{'invisible': [('cutting_tool_type', '!=', '刀盘')]}"> - + @@ -363,7 +363,7 @@ attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"> - + @@ -391,7 +391,7 @@ attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')]}"> - + diff --git a/sf_dlm/views/product_template_view.xml b/sf_dlm/views/product_template_view.xml index 44351c94..c6565d80 100644 --- a/sf_dlm/views/product_template_view.xml +++ b/sf_dlm/views/product_template_view.xml @@ -51,19 +51,12 @@ attrs="{'invisible': ['|',('categ_type', '!=', '表面工艺'),('categ_type', '=', False)]}"/> -