处理冲突

sf_base/models/base.py

@@ -304,33 +304,6 @@ class MachineToolType(models.Model):
     code = fields.Char('编码')
 
 
-# 刀具
-class CuttingTool(models.Model):
-    _name = 'sf.cutting_tool.category'
-    _description = '刀具类别'
-    code = fields.Char('编码')
-    name = fields.Char('名称')
-    remark = fields.Text('备注')
-    active = fields.Boolean('有效', default=True)
-
-
-class CuttingToolType(models.Model):
-    _name = 'sf.cutting_tool.type'
-    _description = '刀具型号'
-    code = fields.Char('编码')
-    name = fields.Char('名称')
-    diameter = fields.Integer('直径')
-    long_blade = fields.Integer('避空长/刃长')
-    cone_angle_pitch = fields.Integer('锥角/节距')
-    shank_diameter = fields.Integer('柄径')
-    taper_shank_length = fields.Integer('锥柄长')
-    tool_length = fields.Integer('刀具总长')
-    blade_number = fields.Integer('刃数')
-    category_id = fields.Many2one('sf.cutting_tool.category', string='刀具类别')
-    brand_id = fields.Many2one('sf.machine.brand', string='品牌')
-    remark = fields.Text('备注')
-    active = fields.Boolean('有效', default=True)
-
 class MachineToolCategory(models.Model):
     _name = 'sf.machine_tool.category'
     _description = '机床类型'