Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀柄和夹头反注册到Cloud生成动态刀具物料

# Conflicts:
#	sf_dlm/views/product_template_view.xml

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

@@ -85,7 +85,7 @@ class ResProductMo(models.Model):
     cutting_tool_neck_diameter = fields.Float('颈部直径(mm)', digits=(6, 1))
     cutting_tool_shank_diameter = fields.Float('柄部直径(mm)', digits=(6, 1))
     cutting_tool_blade_tip_diameter = fields.Float('刀尖直径(mm)', digits=(6, 1))
-    cutting_tool_blade_tip_taper = fields.Float('刀尖锥度(°)', digits=(6, 1))
+    cutting_tool_blade_tip_taper = fields.Integer('刀尖锥度(°)')
     cutting_tool_blade_helix_angle = fields.Integer('刃部螺旋角(°)')
     cutting_tool_blade_type = fields.Char('刃部类型')
     cutting_tool_coarse_medium_fine = fields.Selection([('粗', '粗'), ('中', '中'), ('精', '精')], '粗/中/精')
@@ -170,7 +170,8 @@ class ResProductMo(models.Model):
     #     if self.integral_run_out_accuracy_min <= 0 and self.cutting_tool_type == '整体式刀具':
     #         raise ValidationError("端跳精度最小(min)不能为0")
 
-    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):

sf_manufacturing/models/stock.py

@@ -464,12 +464,12 @@ class ReStockMove(models.Model):
                 'blade_tip_taper': item.product_id.cutting_tool_blade_tip_taper,
                 'blade_helix_angle': item.product_id.cutting_tool_blade_helix_angle,
                 'blade_type': item.product_id.cutting_tool_blade_type,
-                'coarse_medium_fine': item.product_id.cutting_tool_coarse_medium_fine,
+                'coarse_medium_fine': '' if item.product_id.cutting_tool_coarse_medium_fine is False else item.product_id.cutting_tool_coarse_medium_fine,
                 'run_out_accuracy_max': item.product_id.cutting_tool_run_out_accuracy_max,
                 'run_out_accuracy_min': item.product_id.cutting_tool_run_out_accuracy_min,
                 'head_diameter': item.product_id.cutting_tool_head_diameter,
                 'diameter': item.product_id.cutting_tool_diameter,
-                'blade_number': item.product_id.cutting_tool_blade_number,
+                'blade_number': '' if item.product_id.cutting_tool_blade_number is False else item.product_id.cutting_tool_blade_number,
                 'front_angle': item.product_id.cutting_tool_front_angle,
                 'rear_angle': item.product_id.cutting_tool_rear_angle,
                 'main_included_angle': item.product_id.cutting_tool_main_included_angle,
@@ -503,7 +503,7 @@ class ReStockMove(models.Model):
                 'standard_speed': item.product_id.cutting_tool_standard_speed,
                 'speed_max': item.product_id.cutting_tool_speed_max,
                 'cooling_type': item.product_id.cutting_tool_cooling_type,
-                'body_accuracy ': item.product_id.cutting_tool_body_accuracy,
+                'body_accuracy': item.product_id.cutting_tool_body_accuracy,
                 'apply_lock_nut_model': item.product_id.apply_lock_nut_model,
                 'apply_lock_wrench_model': item.product_id.apply_lock_wrench_model,
                 'tool_taper': item.product_id.cutting_tool_taper,

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