Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具物料与夹具物料的反注册

sf_base/models/tool_base_new.py

@@ -14,6 +14,7 @@ class CuttingToolMaterial(models.Model):
     code = fields.Char('编码')
     name = fields.Char('名称')
     remark = fields.Char('备注')
+    active = fields.Boolean('有效', default=True)
 
 
 # 功能刀具
@@ -68,6 +69,7 @@ class FunctionalCuttingTool(models.Model):
     is_standard = fields.Boolean('是否标准刀')
     applicable_range = fields.Char('适用范围')
     image = fields.Binary('图片')
+    active = fields.Boolean('有效', default=True)
 
     def _get_functional_tool_model_ids(self, functional_tool_model_code):
         functional_tool_model_ids = []
@@ -85,6 +87,7 @@ class FunctionalCuttingToolModel(models.Model):
     name = fields.Char('名称', required=True)
     code = fields.Char('编码', required=True)
     remark = fields.Char('备注')
+    active = fields.Boolean('有效', default=True)
 
 
 # 刀具型号
@@ -264,6 +267,7 @@ class CuttingToolModel(models.Model):
     hide_chuck = fields.Boolean(compute='_compute_hide_model_number', default=False, string='隐藏夹头')
     hide_model = fields.Boolean(compute='_compute_hide_model_number', default=True, string='隐藏型号')
     image_is_visible = fields.Boolean(compute='_compute_image_is_visible', default=True, string='隐藏图片')
+    active = fields.Boolean(default=True, string='有效')
 
     @api.depends('mrs_cutting_tool_material_id')
     def _compute_image_is_visible(self):