From 4f898dd8ceac93cc73f5e27aca1f375b9c22eeeb Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Wed, 8 Nov 2023 17:29:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=B3=A8=E9=87=8A=EF=BC=8C?= =?UTF-8?q?=E7=A1=AC=E5=BA=A6=E7=9A=84=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E6=95=B4=E6=95=B0=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_base/models/common.py | 2 +- sf_base/models/tool_other_features.py | 2 +- sf_manufacturing/models/product_template.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sf_base/models/common.py b/sf_base/models/common.py index e781d10d..f116b50f 100644 --- a/sf_base/models/common.py +++ b/sf_base/models/common.py @@ -73,7 +73,7 @@ class MrsMaterialModel(models.Model): price = fields.Float('单价/kg') apply = fields.Many2many('material.apply', string='材料应用') materials_code = fields.Char('材料代号') - hardness = fields.Float("硬度(hrc)") + hardness = fields.Integer("硬度(hrc)") rough_machining = fields.Float("粗加工Vc(m/min)") finish_machining = fields.Float("精加工Vc(m/min)") remark = fields.Text("备注") diff --git a/sf_base/models/tool_other_features.py b/sf_base/models/tool_other_features.py index 0889f087..7bb94711 100644 --- a/sf_base/models/tool_other_features.py +++ b/sf_base/models/tool_other_features.py @@ -299,7 +299,7 @@ class CuttingSpeed(models.Model): slope_milling_angle = fields.Integer('坡铣角度(°)') material_grade = fields.Char('材料牌号') 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_n2 = fields.Char('径向切宽 ae=50%D1 ap=1.5*D1 切削速度Vc') cutting_speed_n3 = fields.Char('径向切宽 ae=25%D1 ap=L1max 切削速度Vc') diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py index 29f5c063..e7ec3bec 100644 --- a/sf_manufacturing/models/product_template.py +++ b/sf_manufacturing/models/product_template.py @@ -3,8 +3,8 @@ from odoo import models, fields, api, _ from odoo.exceptions import ValidationError from odoo.modules import get_resource_path from odoo.addons.sf_base.commons.common import Common -# from OCC.Extend.DataExchange import read_step_file -# from OCC.Extend.DataExchange import write_stl_file +from OCC.Extend.DataExchange import read_step_file +from OCC.Extend.DataExchange import write_stl_file import logging import base64 import hashlib