刀具物料功能模型从sf_base模块迁移到sf_manufacturing模块；新增每齿走刀量模型；整体式刀具物料新增关联每齿走刀量对象字段；

sf_manufacturing/models/__init__.py

@@ -9,6 +9,7 @@ from . import mrp_routing_workcenter
 from . import stock
 from . import res_user
 from . import production_line_base
+from . import tool_other_features
 
 
 

sf_manufacturing/models/product_template.py

@@ -1,8 +1,8 @@
 from odoo import models, fields, api
 from odoo.exceptions import ValidationError
 from odoo.modules import get_resource_path
-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
@@ -100,7 +100,8 @@ class ResProductMo(models.Model):
     cutting_direction_ids = fields.Many2many('sf.cutting.direction', 'rel_cutting_direction_product_template', '走刀方向')
     suitable_coolant_ids = fields.Many2many('sf.suitable.coolant', 'rel_suitable_coolant_product_template', '适合冷却液')
 
-    cutting_speed_ids = fields.Many2many('sf.cutting.speed', 'rel_sf_cutting_speed', '切削速度Vc')
+    cutting_speed_ids = fields.One2many('sf.cutting.speed', 'product_template_id', string='切削速度Vc')
+    feed_per_tooth_ids = fields.One2many('sf.feed.per.tooth', 'product_template_id', string='每齿走刀量fz')
 
     @api.constrains('suitable_machining_method_ids')
     def _check_suitable_machining_method_ids(self):
@@ -662,20 +663,20 @@ class ResProductMo(models.Model):
                 item.model_file = self.transition_glb_file(report_path, model_code)
 
     # 将attach的datas内容转为glb文件
-    def transition_glb_file(self, report_path, code):
-        shapes = read_step_file(report_path)
-        output_file = os.path.join('/tmp', str(code) + '.stl')
-        write_stl_file(shapes, output_file, 'binary', 0.03, 0.5)
-        # 转化为glb
-        output_glb_file = os.path.join('/tmp', str(code) + '.glb')
-        util_path = get_resource_path('sf_dlm', 'static/util')
-        cmd = 'python3 %s/stl2gltf.py %s %s -b' % (util_path, output_file, output_glb_file)
-        os.system(cmd)
-        # 转base64
-        with open(output_glb_file, 'rb') as fileObj:
-            image_data = fileObj.read()
-            base64_data = base64.b64encode(image_data)
-        return base64_data
+    # def transition_glb_file(self, report_path, code):
+    #     shapes = read_step_file(report_path)
+    #     output_file = os.path.join('/tmp', str(code) + '.stl')
+    #     write_stl_file(shapes, output_file, 'binary', 0.03, 0.5)
+    #     # 转化为glb
+    #     output_glb_file = os.path.join('/tmp', str(code) + '.glb')
+    #     util_path = get_resource_path('sf_dlm', 'static/util')
+    #     cmd = 'python3 %s/stl2gltf.py %s %s -b' % (util_path, output_file, output_glb_file)
+    #     os.system(cmd)
+    #     # 转base64
+    #     with open(output_glb_file, 'rb') as fileObj:
+    #         image_data = fileObj.read()
+    #         base64_data = base64.b64encode(image_data)
+    #     return base64_data
 
 
 class ResMrpBomMo(models.Model):

sf_manufacturing/models/tool_other_features.py

@@ -0,0 +1,93 @@
+from odoo import fields, models, api
+
+
+class SuitableMachiningMethod(models.Model):
+    _name = 'sf.suitable.machining.method'
+    _description = '适合加工方式'
+
+    name = fields.Char('名称')
+    image = fields.Image('图片')
+
+
+class BladeTipCharacteristics(models.Model):
+    _name = 'sf.blade.tip.characteristics'
+    _description = '刀尖特征'
+
+    name = fields.Char('名称')
+    image = fields.Image('图片')
+
+
+class HandleType(models.Model):
+    _name = 'sf.handle.type'
+    _description = '柄部类型'
+
+    name = fields.Char('名称')
+    image = fields.Image('图片')
+
+
+class CuttingDirection(models.Model):
+    _name = 'sf.cutting.direction'
+    _description = '走刀方向'
+
+    name = fields.Char('名称')
+    image = fields.Image('图片')
+
+
+class SuitableCoolant(models.Model):
+    _name = 'sf.suitable.coolant'
+    _description = '适合冷却液'
+
+    name = fields.Char('名称')
+    image = fields.Image('图片')
+
+
+class CuttingSpeed(models.Model):
+    _name = 'sf.cutting.speed'
+    _description = '切削速度Vc'
+
+    # def _get_order(self):
+    #     last_tool = self.search([], order='id desc', limit=1)
+    #     if last_tool:
+    #         last_order = int(last_tool.order)
+    #         new_order = last_order + 1
+    #     else:
+    #         new_order = '1'
+    #     return new_order
+    #
+    # order = fields.Char('序', default=_get_order, readonly=True)
+
+    product_template_id = fields.Many2one('product.template', string='产品')
+
+    execution_standard_id = fields.Char('执行标准')
+    material_code = fields.Char('材料代号')
+    material_name = fields.Char('材料名称')
+    material_grade = fields.Char('材料牌号')
+    tensile_strength = fields.Float('拉伸强度 (N/mm²)')
+    hardness = fields.Float('硬度(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')
+    cutting_speed_n4 = fields.Char('径向切宽 ae=15%D1 ap=L1max 切削速度Vc')
+    cutting_speed_n5 = fields.Char('径向切宽 ae=5%D1 ap=L1max 切削速度Vc')
+    rough_machining = fields.Char('粗加工 Vc(m/min)')
+    precision_machining = fields.Char('精加工 Vc(m/min)')
+    application = fields.Selection([('主应用', '主应用'), ('次应用', '次应用')], '主/次应用')
+
+
+class FeedPerTooth(models.Model):
+    _name = 'sf.feed.per.tooth'
+    _description = '每齿走刀量fz'
+
+    product_template_id = fields.Many2one('product.template', string='产品')
+
+    cutting_speed = fields.Char('径向切宽 ae(mm)')
+    materials_type_id = fields.Many2one('sf.materials.model', string='材料型号')
+    blade_diameter = fields.Float('刃部直径D1(mm)', readonly=True, compute='_compute_product_template_id')
+    feed_per_tooth = fields.Char('每齿走刀量 (mm/z)')
+    unit = fields.Char('单位', default='fz')
+
+    @api.depends('product_template_id')
+    def _compute_product_template_id(self):
+        if self.product_template_id is not None:
+            self.blade_diameter = self.product_template_id.integral_blade_diameter