From 3d1d5e6ef3579e496f85715d551b0ab38d479f7a Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Tue, 13 Jun 2023 14:13:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=99=BA=E8=83=BD=E5=B7=A5=E5=8E=82=E5=88=80?=
=?UTF-8?q?=E5=85=B7=E7=89=A9=E6=96=99=E6=A8=A1=E5=9E=8B=E3=80=81=E5=85=B3?=
=?UTF-8?q?=E8=81=94=E5=85=B3=E7=B3=BB=E5=8F=8A=E5=85=B6=E7=95=8C=E9=9D=A2?=
=?UTF-8?q?=E5=B7=B2=E5=BB=BA=E7=AB=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf_base/models/tool_base.py | 37 ++++++++++++++++++++--
sf_base/security/ir.model.access.csv | 2 +-
sf_base/views/tool_base_menu.xml | 38 +++++++++-------------
sf_base/views/tool_base_views.xml | 47 +++++++++++++++++++++++++++-
4 files changed, 97 insertions(+), 27 deletions(-)
diff --git a/sf_base/models/tool_base.py b/sf_base/models/tool_base.py
index b41a1075..452b5ecf 100644
--- a/sf_base/models/tool_base.py
+++ b/sf_base/models/tool_base.py
@@ -7,6 +7,16 @@ from odoo.exceptions import UserError
from datetime import datetime
+# 功能刀具物料
+class CuttingToolMaterial(models.Model):
+ _name = 'sf.cutting.tool.material'
+ _description = '刀具物料'
+
+ code = fields.Char('编码')
+ name = fields.Char('名称')
+ remark = fields.Char('备注')
+
+
# 功能刀具
class FunctionalCuttingTool(models.Model):
_name = 'sf.functional.cutting.tool'
@@ -53,6 +63,8 @@ class IntegralCuttingTool(models.Model):
code = fields.Char('编码')
name = fields.Char('型号名称')
+ # 关联刀具物料
+ cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料', required=True)
# 整体式刀具类型字段，关联整体式刀具类型对象
integral_model_number = fields.Many2one('sf.integral.cutting.tool.model', '整体式刀具类型')
# 增加品牌、总长度(mm)、柄部长度(mm)、刃部长度(mm)、直径(mm)、刃数、前角(°)、后角(°)、主偏角(°)、材料型号、配对螺母(mm)、适用夹头型号、适用范围、图片、创建人、创建时间等字段
@@ -80,6 +92,8 @@ class IntegralCuttingToolModel(models.Model):
code = fields.Char('编码')
name = fields.Char('名称')
+ # 关联刀具物料
+ cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料', required=True)
remark = fields.Text('备注')
@@ -90,10 +104,12 @@ class Blade(models.Model):
code = fields.Char('编码')
name = fields.Char('型号名称')
+ # 关联刀具物料
+ cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料', required=True)
# 刀片类型字段，关联刀片类型对象
blade_model_number = fields.Many2one('sf.blade.model', '刀片类型')
# 编码、型号名称、刀片类型、品牌、长度L(mm)、宽度D(mm)、高度T(mm)、顶角(°)、前角(°)、后角(°)、主偏角(°)、R角(°)、材料型号、加工硬度、配对螺母(mm)、适用刀杆/刀盘型号、刀尖半径(mm)、图片、创建人、创建时间字段
- brand = fields.Many2one('sf.machine.brand', '品牌',)
+ brand = fields.Many2one('sf.machine.brand', '品牌', )
length = fields.Float('长度L(mm)')
width = fields.Float('宽度D(mm)')
height = fields.Float('高度T(mm)')
@@ -120,6 +136,8 @@ class BladeModel(models.Model):
code = fields.Char('编码')
name = fields.Char('名称')
+ # 关联刀具物料
+ cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料', required=True)
# 刀片类型字段，关联刀片对象
blade_ids = fields.One2many('sf.blade', 'blade_model_number', '刀片类型')
remark = fields.Text('备注')
@@ -132,6 +150,8 @@ class CutterBar(models.Model):
code = fields.Char('编码')
name = fields.Char('型号名称')
+ # 关联刀具物料
+ cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料', required=True)
# 刀杆类型字段，关联刀杆类型对象
cutter_bar_model_number = fields.Many2one('sf.cutter.bar.model', '刀杆类型')
# 品牌、C柄径(mm)、L总长(mm)、材料型号、刃数、D刃径(mm)、适用刀片型号、配对扳手(mm)、配备螺丝(mm)、刀尖圆角半径、精度等级、硬度(°)、适用范围、图片、创建人、创建时间
@@ -158,6 +178,8 @@ class CutterBarModel(models.Model):
code = fields.Char('编码')
name = fields.Char('名称')
+ # 关联刀具物料
+ cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料', required=True)
remark = fields.Text('备注')
@@ -168,6 +190,8 @@ class CutterPad(models.Model):
code = fields.Char('编码')
name = fields.Char('型号名称')
+ # 关联刀具物料
+ cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料', required=True)
# 刀盘类型字段，关联刀盘类型对象
cutter_pad_model_number = fields.Many2one('sf.cutter.pad.model', '刀盘类型')
# 增加品牌、C柄径(mm)、L总长(mm)、材料型号、刃数、D刃径(mm)、适用刀片型号、配对扳手(mm)、配备螺丝(mm)、刀尖圆角半径、精度等级、硬度(°)、适用范围、图片、创建人、创建时间
@@ -194,6 +218,8 @@ class CutterPadModel(models.Model):
code = fields.Char('编码')
name = fields.Char('名称')
+ # 关联刀具物料
+ cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料', required=True)
remark = fields.Text('备注')
@@ -204,6 +230,8 @@ class Handle(models.Model):
code = fields.Char('编码')
name = fields.Char('型号名称')
+ # 关联刀具物料
+ cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料', required=True)
# 刀柄类型字段，关联刀柄类型对象
handle_model_number = fields.Many2one('sf.handle.model', '刀柄类型')
# 增加、刀柄类型、品牌、L(mm)、L1(mm)、D1(mm)、重量(kg)、材料型号、本体精度(mm)、配对螺母(mm)、适用夹头型号、夹持范围(mm)、检测精度、检测硬度、标准转速、图片、创建人、创建时间
@@ -230,6 +258,8 @@ class HandleModel(models.Model):
code = fields.Char('编码')
name = fields.Char('名称')
+ # 关联刀具物料
+ cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料', required=True)
remark = fields.Text('备注')
@@ -240,6 +270,8 @@ class Chuck(models.Model):
code = fields.Char('编码')
name = fields.Char('型号名称')
+ # 关联刀具物料
+ cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料', required=True)
# 夹头类型字段，关联夹头类型对象
chuck_model_number = fields.Many2one('sf.chuck.model', '夹头类型')
# 增加品牌、精度(mm)、外径(mm)、内径(mm)、高度(mm)、材料型号、配对螺母(mm)、适用刀柄型号、夹持范围(mm)、特性、图片、创建人、创建时间
@@ -263,5 +295,6 @@ class ChuckModel(models.Model):
code = fields.Char('编码')
name = fields.Char('名称')
+ # 关联刀具物料
+ cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料', required=True)
remark = fields.Text('备注')
-
diff --git a/sf_base/security/ir.model.access.csv b/sf_base/security/ir.model.access.csv
index ff43d323..f07b2fcb 100644
--- a/sf_base/security/ir.model.access.csv
+++ b/sf_base/security/ir.model.access.csv
@@ -31,7 +31,7 @@ access_sf_handle,sf.handle,model_sf_handle,base.group_user,1,1,1,1
access_sf_handle_model,sf.handle.model,model_sf_handle_model,base.group_user,1,1,1,1
access_sf_chuck,sf.chuck,model_sf_chuck,base.group_user,1,1,1,1
access_sf_chuck_model,sf.chuck.model,model_sf_chuck_model,base.group_user,1,1,1,1
-
+access_sf_cutting_tool_material,sf.cutting.tool.material,model_sf_cutting_tool_material,base.group_user,1,1,1,1
access_sf_fixture_setting_element,sf_fixture_setting_element,model_sf_fixture_setting_element,base.group_user,1,1,1,1
access_sf_setting_element_type,sf_setting_element_type,model_sf_setting_element_type,base.group_user,1,1,1,1
diff --git a/sf_base/views/tool_base_menu.xml b/sf_base/views/tool_base_menu.xml
index bde509e3..851fbf21 100644
--- a/sf_base/views/tool_base_menu.xml
+++ b/sf_base/views/tool_base_menu.xml
@@ -100,15 +100,13 @@
sf.chuck.model
tree,form
-
-
-
-
-
-
-
-
-
+
+
+ 刀具物料
+ ir.actions.act_window
+ sf.cutting.tool.material
+ tree,form
+
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-