From b37656d4fec5b1f6f9284297db6b5737ad76a686 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Thu, 20 Jul 2023 09:17:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=9F=E8=83=BD=E5=88=80?=
=?UTF-8?q?=E5=85=B7=E6=A8=A1=E5=9D=97=E7=BB=A7=E6=89=BF=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf_base/models/tool_base_new.py | 32 +++++++++----------
sf_tool_management/models/base.py | 8 ++++-
.../models/tool_material_search.py | 2 +-
.../views/tool_material_search.xml | 2 +-
4 files changed, 25 insertions(+), 19 deletions(-)
diff --git a/sf_base/models/tool_base_new.py b/sf_base/models/tool_base_new.py
index 945ab1eb..048c94d3 100644
--- a/sf_base/models/tool_base_new.py
+++ b/sf_base/models/tool_base_new.py
@@ -26,32 +26,32 @@ class FunctionalCuttingTool(models.Model):
# 整体式刀具型号
mrs_cutting_tool_integral_model_ids = fields.Many2many('sf.cutting.tool.model', 'rel_integral_model_functional_sf',
- string='整体式刀具型号', domain=
- [('mrs_cutting_tool_material_name', '=', '整体式刀具')])
+ string='整体式刀具型号', domain=
+ [('mrs_cutting_tool_material_name', '=', '整体式刀具')])
# 刀片型号
mrs_cutting_tool_blade_model_ids = fields.Many2many('sf.cutting.tool.model', 'rel_blade_model_functional_sf',
- string='刀片型号', domain=
- [('mrs_cutting_tool_material_name', '=', '刀片')])
+ string='刀片型号', domain=
+ [('mrs_cutting_tool_material_name', '=', '刀片')])
# 刀杆型号
mrs_cutting_tool_cutterbar_model_ids = fields.Many2many('sf.cutting.tool.model',
- 'rel_cutterbar_model_functional_sf',
- string='刀杆型号', domain=
- [('mrs_cutting_tool_material_name', '=', '刀杆')])
+ 'rel_cutterbar_model_functional_sf',
+ string='刀杆型号', domain=
+ [('mrs_cutting_tool_material_name', '=', '刀杆')])
# 刀盘型号
mrs_cutting_tool_cutterpad_model_ids = fields.Many2many('sf.cutting.tool.model',
- 'rel_cutterpad_model_functional_sf',
- string='刀盘型号', domain=
- [('mrs_cutting_tool_material_name', '=', '刀盘')])
+ 'rel_cutterpad_model_functional_sf',
+ string='刀盘型号', domain=
+ [('mrs_cutting_tool_material_name', '=', '刀盘')])
# 刀柄型号
mrs_cutting_tool_cutterhandle_model_ids = fields.Many2many('sf.cutting.tool.model',
- 'rel_cutterhandle_model_functional_sf', string='刀柄型号',
- domain=
- [('mrs_cutting_tool_material_name', '=', '刀柄')])
+ 'rel_cutterhandle_model_functional_sf', string='刀柄型号',
+ domain=
+ [('mrs_cutting_tool_material_name', '=', '刀柄')])
# 夹头型号
mrs_cutting_tool_cutterhead_model_ids = fields.Many2many('sf.cutting.tool.model',
- 'rel_cutterhead_model_functional_sf',
- string='夹头型号', domain=
- [('mrs_cutting_tool_material_name', '=', '夹头')])
+ 'rel_cutterhead_model_functional_sf',
+ string='夹头型号', domain=
+ [('mrs_cutting_tool_material_name', '=', '夹头')])
diameter = fields.Float('直径(mm)')
tool_grade = fields.Selection([('1', 'P1'), ('2', 'P2'), ('3', 'P3'), ('4', 'P4'), ('5', 'P5'), ('6', 'P6')],
diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py
index db0c13fb..da76de13 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -2,11 +2,17 @@
from odoo import fields, models, api
+# class FunctionalCuttingToolEntity(models.Model):
+# _name = 'sf.functional.cutting.tool.entity'
+# _inherit = 'sf.functional.cutting.tool'
+# _description = '功能刀具管理'
class FunctionalCuttingToolEntity(models.Model):
_name = 'sf.functional.cutting.tool.entity'
- _inherit = 'sf.functional.cutting.tool'
_description = '功能刀具管理'
+ _inherits = {'sf.functional.cutting.tool': 'sf_functional_cutting_tool_entity_id'}
+ # 新添加的关联到原模型的字段
+ sf_functional_cutting_tool_entity_id = fields.Many2one('sf.functional.cutting.tool', ondelete='cascade')
order = fields.Char(string='序')
functional_cutting_tool_id = fields.Char(string='功能刀具', invisible=True)
# 功能刀具预警 特有字段
diff --git a/sf_tool_management/models/tool_material_search.py b/sf_tool_management/models/tool_material_search.py
index bd53d8db..645cc0ac 100644
--- a/sf_tool_management/models/tool_material_search.py
+++ b/sf_tool_management/models/tool_material_search.py
@@ -16,7 +16,7 @@ class SfToolMaterialSearch(models.Model):
domain="[('mrs_cutting_tool_material_id.name', '=', mrs_cutting_tool_material_name)]")
mrs_machine_brand_id = fields.Many2one('sf.machine.brand', '品牌')
# 关联刀具型号
- mrs_cutting_tool_model_id = fields.Many2one('sf.cutting.tool.model', '刀具型号')
+ # mrs_cutting_tool_model_id = fields.Many2one('sf.cutting.tool.model', '刀具型号')
# 关联刀具物料模型
mrs_cutting_tool_material_id = fields.Many2one('sf.cutting.tool.material', '刀具物料')
diff --git a/sf_tool_management/views/tool_material_search.xml b/sf_tool_management/views/tool_material_search.xml
index 4865f553..e42cf8fe 100644
--- a/sf_tool_management/views/tool_material_search.xml
+++ b/sf_tool_management/views/tool_material_search.xml
@@ -11,7 +11,7 @@
-
+