jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.去掉不要的代码2,.产品页面新增规格字段

Browse Source
This commit is contained in:
jinling.yang
2023-10-25 15:07:29 +08:00
parent 7b471be4cf
commit 39f97131a2
10 changed files with 31 additions and 427 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
sf_base/models/tool_other_features.py
View File

@@ -5,13 +5,13 @@ class ToolMaterialsBasicParameters(models.Model):
_name = 'sf.tool.materials.basic.parameters'
_description = '刀具物料基本参数'
name = fields.Char('物料号', size=50)
standard_library_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀具标准库')
specification_id = fields.Many2one('sf.cutting_tool.specification.wizard', string='刀具规格')
cutting_tool_type = fields.Char(related='standard_library_id.cutting_tool_type', string='刀具物料类型',
store=True)
# 整体式刀具参数
code = fields.Char('物料号', size=50)
# 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')],
@@ -123,10 +123,15 @@ 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, '', {
'standard_library_id': 1,
'code': obj['code'],
'name': obj['code'],
'cutting_tool_type': obj['cutting_tool_type'],
'total_length': obj['total_length'],
'blade_diameter': obj['blade_diameter'],
@@ -149,7 +154,7 @@ class ToolMaterialsBasicParameters(models.Model):
def _json_blade_basic_param(self, obj):
blade_basic_param_str = (0, '', {
'code': obj['code'],
'name': obj['code'],
'cutting_tool_type': obj['cutting_tool_type'],
'length': obj['length'],
'thickness': obj['thickness'],
@@ -179,7 +184,7 @@ class ToolMaterialsBasicParameters(models.Model):
def _json_cutter_arbor_basic_param(self, obj):
cutter_arbor_basic_param_str = (0, '', {
'code': obj['code'],
'name': obj['code'],
'cutting_tool_type': obj['cutting_tool_type'],
'height': obj['height'],
'width': obj['width'],
@@ -210,7 +215,7 @@ class ToolMaterialsBasicParameters(models.Model):
def _json_cutter_head_basic_param(self, obj):
cutter_head_basic_param_str = (0, '', {
'code': obj['code'],
'name': obj['code'],
'cutting_tool_type': obj['cutting_tool_type'],
'install_blade_tip_num': obj['install_blade_tip_num'],
'blade_diameter': obj['blade_diameter'],
@@ -233,7 +238,7 @@ class ToolMaterialsBasicParameters(models.Model):
def _json_knife_handle_basic_param(self, obj):
knife_handle_basic_param_str = (0, '', {
'code': obj['code'],
'name': obj['code'],
'cutting_tool_type': obj['cutting_tool_type'],
'total_length': obj['total_length'],
'flange_shank_length': obj['flange_shank_length'],
@@ -261,7 +266,7 @@ class ToolMaterialsBasicParameters(models.Model):
def _json_chuck_basic_param(self, obj):
chuck_basic_param_str = (0, '', {
'code': obj['code'],
'name': obj['code'],
'cutting_tool_type': obj['cutting_tool_type'],
'er_size_model': obj['er_size_model'],
'min_clamping_diameter': obj['min_clamping_diameter'],

12
sf_base/views/tool_views.xml
View File

@@ -255,7 +255,7 @@
attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}">
<tree editable="bottom" class="center" delete="1">
<field name="cutting_tool_type" invisible="1"/>
<field name="code"/>
<field name="name"/>
<field name="total_length"/>
<field name="blade_diameter" class="diameter"/>
<field name="blade_length"/>
@@ -279,7 +279,7 @@
attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}">
<tree editable="bottom" class="center" delete="1">
<field name="cutting_tool_type" invisible="1"/>
<field name="code"/>
<field name="name"/>
<field name="length"/>
<field name="thickness"/>
<field name="width"/>
@@ -309,7 +309,7 @@
attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')]}">
<tree editable="bottom" class="center" delete="1">
<field name="cutting_tool_type" invisible="1"/>
<field name="code"/>
<field name="name"/>
<field name="height"/>
<field name="width"/>
<field name="total_length"/>
@@ -340,7 +340,7 @@
attrs="{'invisible': [('cutting_tool_type', '!=', '刀盘')]}">
<tree editable="bottom" class="center" delete="1">
<field name="cutting_tool_type" invisible="1"/>
<field name="code"/>
<field name="name"/>
<field name="install_blade_tip_num"/>
<field name="blade_diameter" class="diameter"/>
<field name="cutter_head_diameter" class="diameter"/>
@@ -363,7 +363,7 @@
attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}">
<tree editable="bottom" class="center" delete="1">
<field name="cutting_tool_type" invisible="1"/>
<field name="code"/>
<field name="name"/>
<field name="total_length"/>
<field name="flange_shank_length"/>
<field name="handle_external_diameter" class="diameter"/>
@@ -391,7 +391,7 @@
attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')]}">
<tree editable="bottom" class="center" delete="1">
<field name="cutting_tool_type" invisible="1"/>
<field name="code"/>
<field name="name"/>
<field name="er_size_model"/>
<field name="min_clamping_diameter" class="diameter" required="1"/>
<field name="max_clamping_diameter" class="diameter"/>