diff --git a/sf_base/models/tool_other_features.py b/sf_base/models/tool_other_features.py
index acbb569d..c03ea9e9 100644
--- a/sf_base/models/tool_other_features.py
+++ b/sf_base/models/tool_other_features.py
@@ -6,6 +6,7 @@ class ToolMaterialsBasicParameters(models.Model):
_description = '刀具物料基本参数'
name = fields.Char('物料号', size=50)
+ code = fields.Char('编码', size=50)
standard_library_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀具标准库')
cutting_tool_type = fields.Char(related='standard_library_id.cutting_tool_type', string='刀具物料类型',
store=True)
@@ -73,11 +74,8 @@ class ToolMaterialsBasicParameters(models.Model):
is_cooling_hole = fields.Boolean('有无冷却孔')
locating_slot_code = fields.Char('定位槽代号', size=20)
installing_structure = fields.Char('安装结构', size=20)
- blade_ids = fields.Many2many(
- 'sf.cutting.tool.type',
- relation='basic_param_pad_blade_rel',
- column1='model_id_1',
- column2='model_id_2',
+ blade_id = fields.Many2one(
+ 'sf.cutting_tool.standard.library',
domain="[('cutting_tool_material_id.name', '=', '刀片')]",
string='适配刀片型号' # 使用空列表作为默认值
)
@@ -91,13 +89,17 @@ class ToolMaterialsBasicParameters(models.Model):
interface_diameter = fields.Float('接口直径(mm)')
# 刀柄参数
flange_shank_length = fields.Float('法兰柄长(mm)')
+ flange_diameter = fields.Float('法兰直径(mm)')
handle_external_diameter = fields.Float('柄部外径(mm)')
handle_inside_diameter = fields.Float('柄部内径(mm)')
+ dynamic_balance_class = fields.Char('动平衡等级')
min_clamping_diameter = fields.Float('最小夹持直径(mm)')
max_clamping_diameter = fields.Float('最大夹持直径(mm)')
clamping_mode = fields.Char('夹持方式', size=20)
max_load_capacity = fields.Float('最大负载能力(kg)')
taper = fields.Integer('锥度(°)')
+ shank_length = fields.Float('刀柄长度(mm)', digits=(3, 2))
+ shank_diameter = fields.Float('刀柄直径(mm)')
tool_changing_time = fields.Integer('换刀时间(s)')
standard_rotate_speed = fields.Integer('标准转速(n/min)')
max_rotate_speed = fields.Integer('最大转速(n/min)')
@@ -108,6 +110,13 @@ class ToolMaterialsBasicParameters(models.Model):
is_quick_cutting = fields.Boolean('可高速切削', default=False)
is_drill_hole = fields.Boolean('可钻孔', default=False)
is_safe_lock = fields.Boolean('有无安全锁', default=False)
+ chuck_id = fields.Many2one(
+ 'sf.cutting_tool.standard.library',
+ domain="[('cutting_tool_material_id.name', '=', '夹头')]",
+ string='适配夹头型号' # 使用空列表作为默认值
+ )
+ nut = fields.Char('适用锁紧螺母型号')
+
# 夹头参数
er_size_model = fields.Char('ER尺寸型号', size=20)
outer_diameter = fields.Float('外径(mm)')
@@ -118,11 +127,8 @@ class ToolMaterialsBasicParameters(models.Model):
clamping_length = fields.Float('夹持长度(mm)')
clamping_tolerance = fields.Char('夹持公差(mm)', size=20)
cooling_jacket = fields.Char('适用冷却套型号', size=50)
- handle_ids = fields.Many2many(
- 'sf.cutting.tool.type',
- relation='basic_param_chuck_handle_rel',
- column1='model_id_1',
- column2='model_id_2',
+ handle_id = fields.Many2one(
+ 'sf.cutting_tool.standard.library',
domain="[('cutting_tool_material_id.name', '=', '刀柄')]",
string='适用刀柄型号'
)
diff --git a/sf_base/views/tool_views.xml b/sf_base/views/tool_views.xml
index e7015700..14c5ffd4 100644
--- a/sf_base/views/tool_views.xml
+++ b/sf_base/views/tool_views.xml
@@ -277,7 +277,7 @@
-
+
@@ -300,7 +300,7 @@
-
+
@@ -356,7 +356,7 @@
-
+
diff --git a/sf_dlm_management/__manifest__.py b/sf_dlm_management/__manifest__.py
index a5c894d4..813fdb3f 100644
--- a/sf_dlm_management/__manifest__.py
+++ b/sf_dlm_management/__manifest__.py
@@ -11,7 +11,7 @@
'website': 'https://www.sf.jikimo.com',
'depends': ['sf_sale', 'sf_dlm', 'sf_manufacturing'],
'data': [
- 'data/stock_data.xml',
+ # 'data/stock_data.xml',
'views/product_template_management_view.xml',
],
'demo': [
diff --git a/sf_dlm_management/views/product_template_management_view.xml b/sf_dlm_management/views/product_template_management_view.xml
index 737d56db..f096de62 100644
--- a/sf_dlm_management/views/product_template_management_view.xml
+++ b/sf_dlm_management/views/product_template_management_view.xml
@@ -28,13 +28,13 @@
options="{'no_create': True}"
attrs="{'invisible': ['|',('categ_type', '!=', '表面工艺'),('categ_type', '=', False)]}"/>
@@ -42,7 +42,7 @@
attrs="{'invisible': [('categ_type', '!=', '夹具')]}"
domain="[('fixture_material_id','=',fixture_material_id)]"/>
- {'readonly': [('categ_id', '!=', False)]}
+ {'readonly': [('create_uid', '!=', False)]}
@@ -140,23 +140,6 @@
attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')],'readonly': [('categ_type', '=', '刀具')]}"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-