Merge remote-tracking branch 'origin/feature/接口及CAM用刀' into feature/CAM用刀优化及添加接口

sf_manufacturing/models/mrp_workorder.py

@@ -597,6 +597,7 @@ class CNCprocessing(models.Model):
     cnc_id = fields.Many2one('ir.attachment')
     sequence_number = fields.Char('序号')
     program_name = fields.Char('程序名')
+    functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型')
     cutting_tool_name = fields.Char('刀具名称')
     cutting_tool_no = fields.Char('刀号')
     processing_type = fields.Char('加工类型')

sf_manufacturing/models/product_template.py

@@ -870,21 +870,9 @@ class SfMaintenanceEquipmentTool(models.Model):
     _description = '机床刀位'
 
     equipment_id = fields.Many2one('maintenance.equipment', string='设备')
-    product_template_id = fields.Many2one('product.template', string='功能刀具名称',
-                                          domain="[('categ_type', '=', '刀具')]")
-    image_1920 = fields.Binary('图片', related='product_template_id.image_1920')
-    categ_type = fields.Char(string='功能刀具类型')
-    diameter = fields.Char('直径')
-    precision = fields.Char('粗\中\精')
-    tool_code = fields.Char('功能刀具编码')
-    hilt_name = fields.Char('刀柄名称')
-    hilt_code = fields.Char('刀柄编码')
-    life_value_max = fields.Char('最大寿命值')
-    alarm_value = fields.Char('报警值')
-    used_value = fields.Char('已使用值')
-    code = fields.Char('机床刀位号')
 
-    name = fields.Char('', compute='_compute_name')
+    code = fields.Char('机床刀位号')
+    name = fields.Char('刀位号', compute='_compute_name')
 
     @api.depends('code')
     def _compute_name(self):