From c3ba11bed4b37c67394e0d633f7e855a65301b00 Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Wed, 29 Nov 2023 10:17:43 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=88=80=E5=85=B7=E5=AE=89=E5=85=A8=E5=BA=93=E5=AD=98=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B=E7=9A=84=E5=88=80=E5=B0=96=E7=89=B9=E5=BE=81=E3=80=81?= =?UTF-8?q?=E6=9F=84=E9=83=A8=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5=E7=9A=84?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B=E4=B8=BAmany2one?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_tool_management/models/base.py | 13 +++++++------ sf_tool_management/models/tool_material_search.py | 6 ++++-- sf_tool_management/views/tool_base_views.xml | 7 ++++--- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py index f2aaaff0..b5e62d6e 100644 --- a/sf_tool_management/models/base.py +++ b/sf_tool_management/models/base.py @@ -81,7 +81,8 @@ class FunctionalCuttingToolEntity(models.Model): suitable_machining_method_ids = fields.Many2many( 'maintenance.equipment.image', 'rel_machining_product_template_tool_entity', '适合加工方式', domain=[('type', '=', '加工能力')], related='cutting_tool_integral_model_id.suitable_machining_method_ids') - blade_tip_characteristics_id = fields.Many2one('maintenance.equipment.image', '刀尖特征', + blade_tip_characteristics_id = fields.Many2one( + 'maintenance.equipment.image', '刀尖特征', domain=[('type', '=', '刀尖特征')], related='cutting_tool_integral_model_id.blade_tip_characteristics_id') handle_type_id = fields.Many2one( 'maintenance.equipment.image', '柄部类型', @@ -202,13 +203,13 @@ class RealTimeDistributionOfFunctionalTools(models.Model): 'maintenance.equipment.image', 'rel_machining_product_template_distribution', '适合加工方式', domain=[('type', '=', '加工能力')], related='sf_functional_cutting_tool_entity_ids.suitable_machining_method_ids') - blade_tip_characteristics_id = fields.Many2many( - 'maintenance.equipment.image', 'rel_blade_tip_product_template_distribution', '刀尖特征', + blade_tip_characteristics_id = fields.Many2one( + 'maintenance.equipment.image', '刀尖特征', domain=[('type', '=', '刀尖特征')], related='sf_functional_cutting_tool_entity_ids.blade_tip_characteristics_id') - handle_type_ids = fields.Many2many( - 'maintenance.equipment.image', 'rel_handle_product_template_distribution', '柄部类型', - domain=[('type', '=', '柄部类型')], related='sf_functional_cutting_tool_entity_ids.handle_type_ids') + handle_type_id = fields.Many2one( + 'maintenance.equipment.image', '柄部类型', + domain=[('type', '=', '柄部类型')], related='sf_functional_cutting_tool_entity_ids.handle_type_id') cutting_direction_ids = fields.Many2many( 'maintenance.equipment.image', 'rel_cutting_product_template_distribution', '走刀方向', domain=[('type', '=', '走刀方向')], related='sf_functional_cutting_tool_entity_ids.cutting_direction_ids') diff --git a/sf_tool_management/models/tool_material_search.py b/sf_tool_management/models/tool_material_search.py index e78766f4..1dc48322 100644 --- a/sf_tool_management/models/tool_material_search.py +++ b/sf_tool_management/models/tool_material_search.py @@ -1,5 +1,7 @@ # -*- coding: utf-8 -*- from odoo import fields, models, api, SUPERUSER_ID + + # from odoo.exceptions import ValidationError @@ -100,8 +102,8 @@ class SfToolMaterialSearch(models.Model): 'rel_machining_product_template_material_search', '适合加工方式', domain=[('type', '=', '加工能力')]) blade_tip_characteristics_id = fields.Many2one('maintenance.equipment.image', '刀尖特征', - domain=[('type', '=', '刀尖特征')]) - handle_type_id = fields.Many2many('maintenance.equipment.image', '柄部类型',domain=[('type', '=', '柄部类型')]) + domain=[('type', '=', '刀尖特征')]) + handle_type_id = fields.Many2one('maintenance.equipment.image', '柄部类型', domain=[('type', '=', '柄部类型')]) cutting_direction_ids = fields.Many2many('maintenance.equipment.image', 'rel_cutting_product_template_material_search', '走刀方向', domain=[('type', '=', '走刀方向')]) diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml index d1be9bf2..6e2258e5 100644 --- a/sf_tool_management/views/tool_base_views.xml +++ b/sf_tool_management/views/tool_base_views.xml @@ -329,12 +329,13 @@ - +