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

去掉注释，硬度的字段类型改为整数型

Browse Source
This commit is contained in:
jinling.yang
2023-11-08 17:29:38 +08:00
parent 4c57bbe791
commit 4f898dd8ce
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_base/models/common.py
View File

@@ -73,7 +73,7 @@ class MrsMaterialModel(models.Model):
price = fields.Float('单价/kg') price = fields.Float('单价/kg')
apply = fields.Many2many('material.apply', string='材料应用') apply = fields.Many2many('material.apply', string='材料应用')
materials_code = fields.Char('材料代号') materials_code = fields.Char('材料代号')
hardness = fields.Float("硬度(hrc)") hardness = fields.Integer("硬度(hrc)")
rough_machining = fields.Float("粗加工Vc(m/min)") rough_machining = fields.Float("粗加工Vc(m/min)")
finish_machining = fields.Float("精加工Vc(m/min)") finish_machining = fields.Float("精加工Vc(m/min)")
remark = fields.Text("备注") remark = fields.Text("备注")

2
sf_base/models/tool_other_features.py
View File

@@ -299,7 +299,7 @@ class CuttingSpeed(models.Model):
slope_milling_angle = fields.Integer('坡铣角度(°)') slope_milling_angle = fields.Integer('坡铣角度(°)')
material_grade = fields.Char('材料牌号') material_grade = fields.Char('材料牌号')
tensile_strength = fields.Char('拉伸强度 (N/mm²)') tensile_strength = fields.Char('拉伸强度 (N/mm²)')
hardness = fields.Float('硬度(HRC)') hardness = fields.Integer('硬度(HRC)')
cutting_speed_n1 = fields.Char('径向切宽 ae=100%D1 ap=1*D1 切削速度Vc') cutting_speed_n1 = fields.Char('径向切宽 ae=100%D1 ap=1*D1 切削速度Vc')
cutting_speed_n2 = fields.Char('径向切宽 ae=50%D1 ap=1.5*D1 切削速度Vc') cutting_speed_n2 = fields.Char('径向切宽 ae=50%D1 ap=1.5*D1 切削速度Vc')
cutting_speed_n3 = fields.Char('径向切宽 ae=25%D1 ap=L1max 切削速度Vc') cutting_speed_n3 = fields.Char('径向切宽 ae=25%D1 ap=L1max 切削速度Vc')

4
sf_manufacturing/models/product_template.py
View File

@@ -3,8 +3,8 @@ from odoo import models, fields, api, _
from odoo.exceptions import ValidationError from odoo.exceptions import ValidationError
from odoo.modules import get_resource_path from odoo.modules import get_resource_path
from odoo.addons.sf_base.commons.common import Common from odoo.addons.sf_base.commons.common import Common
# from OCC.Extend.DataExchange import read_step_file from OCC.Extend.DataExchange import read_step_file
# from OCC.Extend.DataExchange import write_stl_file from OCC.Extend.DataExchange import write_stl_file
import logging import logging
import base64 import base64
import hashlib import hashlib