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

Accept Merge Request #510: (feature/同步刀具标准库（刀杆） -> develop)

Browse Source 
Merge Request: 修复刀具标准库（刀杆）

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/510?initial=true
This commit is contained in:
杨金灵
2023-11-03 10:44:46 +08:00
committed by Coding
parent 53ad002f3b 686c049e52
commit 3be0d1ffad
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sf_base/models/tool_other_features.py
View File

@@ -61,6 +61,9 @@ class ToolMaterialsBasicParameters(models.Model):
# 刀杆参数 # 刀杆参数
height = fields.Char('高度(mm)', size=20) height = fields.Char('高度(mm)', size=20)
blade_height = fields.Char('刃部高度(mm)', size=20) blade_height = fields.Char('刃部高度(mm)', size=20)
knife_head_height = fields.Char('刀头高度(mm)', size=20)
knife_head_width = fields.Char('刀头宽度(mm)', size=20)
knife_head_length = fields.Char('刀头长度(mm)', size=20)
cut_depth_max = fields.Char('最大切削深度(mm)', size=20) cut_depth_max = fields.Char('最大切削深度(mm)', size=20)
cutter_arbor_diameter = fields.Char('刀杆直径(mm)', size=20) cutter_arbor_diameter = fields.Char('刀杆直径(mm)', size=20)
min_machining_aperture = fields.Char('最小加工孔径(mm)', size=20) min_machining_aperture = fields.Char('最小加工孔径(mm)', size=20)
@@ -182,11 +185,10 @@ class ToolMaterialsBasicParameters(models.Model):
'cutting_tool_type': obj['cutting_tool_type'], 'cutting_tool_type': obj['cutting_tool_type'],
'height': obj['height'], 'height': obj['height'],
'width': obj['width'], 'width': obj['width'],
'blade_height': obj['blade_height'],
'total_length': obj['total_length'], 'total_length': obj['total_length'],
'blade_width': obj['blade_width'], 'knife_head_height': obj['knife_head_height'],
'blade_length': obj['blade_length'], 'knife_head_width': obj['knife_head_width'],
'blade_height': obj['blade_height'], 'knife_head_length': obj['knife_head_length'],
'cutter_arbor_diameter': obj['cutter_arbor_diameter'], 'cutter_arbor_diameter': obj['cutter_arbor_diameter'],
'main_included_angle': obj['main_included_angle'], 'main_included_angle': obj['main_included_angle'],
'relief_angle': obj['relief_angle'], 'relief_angle': obj['relief_angle'],

2
sf_dlm/__manifest__.py
View File

@@ -10,7 +10,7 @@
""", """,
'category': 'sf', 'category': 'sf',
'website': 'https://www.sf.jikimo.com', 'website': 'https://www.sf.jikimo.com',
'depends': ['mrp', 'base', 'sale', 'sf_manufacturing', 'web_widget_model_viewer', 'mrp_subcontracting', 'depends': ['mrp', 'base', 'sf_manufacturing', 'web_widget_model_viewer', 'mrp_subcontracting',
'purchase_stock', 'purchase_stock',
'uom', 'jikimo_frontend', 'product'], 'uom', 'jikimo_frontend', 'product'],
'data': [ 'data': [

4
sf_manufacturing/models/product_template.py
View File

@@ -288,6 +288,10 @@ class ResProductMo(models.Model):
self.cutting_tool_blade_length = self.specification_id.blade_length self.cutting_tool_blade_length = self.specification_id.blade_length
self.cutting_tool_cutter_head_diameter = self.specification_id.cutter_head_diameter self.cutting_tool_cutter_head_diameter = self.specification_id.cutter_head_diameter
self.cutting_tool_interface_diameter = self.specification_id.interface_diameter self.cutting_tool_interface_diameter = self.specification_id.interface_diameter
else:
self.cutting_tool_knife_head_height = self.specification_id.knife_head_height
self.cutting_tool_knife_head_width = self.specification_id.knife_head_width
self.cutting_tool_knife_head_length = self.specification_id.knife_head_length
elif self.cutting_tool_type == '刀柄': elif self.cutting_tool_type == '刀柄':
self.cutting_tool_total_length = self.specification_id.total_length self.cutting_tool_total_length = self.specification_id.total_length
self.cutting_tool_standard_speed = self.specification_id.standard_rotate_speed self.cutting_tool_standard_speed = self.specification_id.standard_rotate_speed