diff --git a/sf_base/__manifest__.py b/sf_base/__manifest__.py
index a34868b9..1fb1daa6 100644
--- a/sf_base/__manifest__.py
+++ b/sf_base/__manifest__.py
@@ -20,6 +20,7 @@
'views/functional_fixture_view.xml',
'views/menu_view.xml',
'views/tool_views.xml',
+ 'views/tool_basic_param.xml',
'views/tool_menu.xml',
'views/menu_fixture_view.xml',
diff --git a/sf_base/models/tool_base_new.py b/sf_base/models/tool_base_new.py
index b4660948..e2839763 100644
--- a/sf_base/models/tool_base_new.py
+++ b/sf_base/models/tool_base_new.py
@@ -140,12 +140,12 @@ class CuttingToolModel(models.Model):
integral_run_out_accuracy_max = fields.Char('整体式刀具端跳精度max')
integral_run_out_accuracy_min = fields.Char('整体式刀具端跳精度min')
- fit_blade_shape_ids = fields.Many2many('maintenance.equipment.image', 'fit_blade_shape_library_rel',
+ fit_blade_shape_id = fields.Many2many('maintenance.equipment.image', 'fit_blade_shape_library_rel',
'适配刀片形状', domain=[('type', '=', '刀片形状')])
suitable_machining_method_ids = fields.Many2many('maintenance.equipment.image',
'suitable_machining_method_library_rel',
'适合加工方式', domain=[('type', '=', '加工能力')])
- blade_tip_characteristics_ids = fields.Many2many('maintenance.equipment.image',
+ blade_tip_characteristics_id = fields.Many2many('maintenance.equipment.image',
'blade_tip_character_library_rel',
'刀尖特征', domain=[('type', '=', '刀尖特征')])
handle_type_ids = fields.Many2many('maintenance.equipment.image', 'handle_type_library_rel',
diff --git a/sf_base/models/tool_other_features.py b/sf_base/models/tool_other_features.py
index 4e02a92c..f97c9a9f 100644
--- a/sf_base/models/tool_other_features.py
+++ b/sf_base/models/tool_other_features.py
@@ -11,7 +11,6 @@ class ToolMaterialsBasicParameters(models.Model):
store=True)
# 整体式刀具参数
- # 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')],
@@ -124,15 +123,9 @@ 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, '', {
- 'name': obj['code'],
+ 'name': obj['name'],
'cutting_tool_type': obj['cutting_tool_type'],
'total_length': obj['total_length'],
'blade_diameter': obj['blade_diameter'],
@@ -155,7 +148,7 @@ class ToolMaterialsBasicParameters(models.Model):
def _json_blade_basic_param(self, obj):
blade_basic_param_str = (0, '', {
- 'name': obj['code'],
+ 'name': obj['name'],
'cutting_tool_type': obj['cutting_tool_type'],
'length': obj['length'],
'thickness': obj['thickness'],
@@ -185,7 +178,7 @@ class ToolMaterialsBasicParameters(models.Model):
def _json_cutter_arbor_basic_param(self, obj):
cutter_arbor_basic_param_str = (0, '', {
- 'name': obj['code'],
+ 'name': obj['name'],
'cutting_tool_type': obj['cutting_tool_type'],
'height': obj['height'],
'width': obj['width'],
@@ -216,7 +209,7 @@ class ToolMaterialsBasicParameters(models.Model):
def _json_cutter_head_basic_param(self, obj):
cutter_head_basic_param_str = (0, '', {
- 'name': obj['code'],
+ 'name': obj['name'],
'cutting_tool_type': obj['cutting_tool_type'],
'install_blade_tip_num': obj['install_blade_tip_num'],
'blade_diameter': obj['blade_diameter'],
@@ -239,7 +232,7 @@ class ToolMaterialsBasicParameters(models.Model):
def _json_knife_handle_basic_param(self, obj):
knife_handle_basic_param_str = (0, '', {
- 'name': obj['code'],
+ 'name': obj['name'],
'cutting_tool_type': obj['cutting_tool_type'],
'total_length': obj['total_length'],
'flange_shank_length': obj['flange_shank_length'],
@@ -267,7 +260,7 @@ class ToolMaterialsBasicParameters(models.Model):
def _json_chuck_basic_param(self, obj):
chuck_basic_param_str = (0, '', {
- 'name': obj['code'],
+ 'name': obj['name'],
'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_basic_param.xml b/sf_base/views/tool_basic_param.xml
new file mode 100644
index 00000000..1cc631f0
--- /dev/null
+++ b/sf_base/views/tool_basic_param.xml
@@ -0,0 +1,134 @@
+
+
+
+
+
+ sf.tool.materials.basic.parameters.tree
+ sf.tool.materials.basic.parameters
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ sf.tool.materials.basic.parameters.tree
+ sf.tool.materials.basic.parameters
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ sf.tool.materials.basic.parameters.tree
+ sf.tool.materials.basic.parameters
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ sf.tool.materials.basic.parameters.tree
+ sf.tool.materials.basic.parameters
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ sf.tool.materials.basic.parameters.search
+ sf.tool.materials.basic.parameters
+
+
+
+
+
+
+
+
+ 基础参数
+ sf.tool.materials.basic.parameters
+ tree
+
+
+ []
+
+
+
+
+
diff --git a/sf_base/views/tool_views.xml b/sf_base/views/tool_views.xml
index bfaac129..fe2fcf5c 100644
--- a/sf_base/views/tool_views.xml
+++ b/sf_base/views/tool_views.xml
@@ -35,13 +35,6 @@
-
-
-
-
-
-
-
@@ -60,52 +53,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ options="{'no_create': True, 'no_quick_create': True}"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -220,7 +170,7 @@
-
+
@@ -229,7 +179,7 @@
-
@@ -558,5 +508,34 @@
[]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sf_dlm/views/product_template_view.xml b/sf_dlm/views/product_template_view.xml
index eda7f88b..130be2c4 100644
--- a/sf_dlm/views/product_template_view.xml
+++ b/sf_dlm/views/product_template_view.xml
@@ -54,9 +54,13 @@
- 规格-->
+
+
+
+
@@ -415,7 +419,7 @@
-
+
@@ -424,7 +428,7 @@
-
@@ -445,7 +449,8 @@
-
+
@@ -466,7 +471,8 @@
-
+
-
+
-
+