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

sf_base/models/tool_base.py

@@ -15,6 +15,7 @@ class CuttingToolMaterial(models.Model):
     code = fields.Char('编码')
     name = fields.Char('名称')
     remark = fields.Char('备注')
+    active = fields.Boolean('有效', default=True)
 
 
 # 功能刀具
@@ -43,6 +44,7 @@ class FunctionalCuttingTool(models.Model):
     is_standard = fields.Boolean('是否标准刀')
     applicable_range = fields.Char('适用范围')
     image = fields.Binary('图片')
+    active = fields.Boolean('有效', default=True)
 
 
 # 功能刀具类型
@@ -53,6 +55,7 @@ class FunctionalCuttingToolModel(models.Model):
     name = fields.Char('名称')
     code = fields.Char('编码')
     remark = fields.Char('备注')
+    active = fields.Boolean('有效', default=True)
 
 
 # 整体式刀具
@@ -82,6 +85,7 @@ class IntegralCuttingTool(models.Model):
     chuck_model = fields.Many2many('sf.chuck', string='适用夹头型号')
     scope = fields.Char('适用范围')
     image = fields.Binary('图片')
+    active = fields.Boolean('有效', default=True)
 
 
 # 整体式刀具类型