diff --git a/sf_base/models/tool_other_features.py b/sf_base/models/tool_other_features.py index 5bd597ae..9dd30710 100644 --- a/sf_base/models/tool_other_features.py +++ b/sf_base/models/tool_other_features.py @@ -21,7 +21,7 @@ class ToolMaterialsBasicParameters(models.Model): neck_length = fields.Float('颈部长度(mm)') handle_diameter = fields.Float('柄部直径(mm)') handle_length = fields.Float('柄部长度(mm)') - blade_tip_diameter = fields.Integer('刀尖直径(mm)') + blade_tip_diameter = fields.Float('刀尖直径(mm)') blade_tip_working_size = fields.Char('刀尖倒角度(°)', size=20) tip_r_size = fields.Float('刀尖R角(mm)') blade_tip_taper = fields.Integer('刀尖锥度(°)') diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py index 48cabaf7..b18ab04c 100644 --- a/sf_manufacturing/models/product_template.py +++ b/sf_manufacturing/models/product_template.py @@ -237,8 +237,8 @@ class ResProductMo(models.Model): self.cutting_tool_blade_tip_diameter = self.specification_id.blade_tip_diameter self.cutting_tool_blade_tip_taper = self.specification_id.blade_tip_taper self.cutting_tool_blade_helix_angle = self.specification_id.blade_helix_angle - self.cutting_tool_blade_tip_working_size = self.specification_id.tip_r_size - self.cutting_tool_blade_tip_r_size = self.specification_id.blade_tip_working_size + self.cutting_tool_blade_tip_working_size = self.specification_id.blade_tip_working_size + self.cutting_tool_blade_tip_r_size = self.specification_id.tip_r_size self.cutting_tool_pitch = self.specification_id.pitch self.cutting_tool_blade_width = self.specification_id.blade_width self.cutting_tool_blade_depth = self.specification_id.blade_depth