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

sf_base/models/base.py

@@ -21,7 +21,8 @@ class MachineControlSystem(models.Model):
     _description = '控制系统'
 
     code = fields.Char('编码', size=10)
-    name = fields.Char('名称', size=10)
+    name = fields.Char('名称')
+    remark = fields.Char('备注')
     brand_id = fields.Many2one('sf.machine.brand', '品牌')
     active = fields.Boolean('有效', default=True)
 
@@ -35,10 +36,10 @@ class MachineBrand(models.Model):
     name = fields.Char('名称')
     tag_ids = fields.Many2many('sf.machine.brand.tags', 'rel_machine_brand_tags', string='类别')
     image_brand = fields.Image("品牌图片")
-    manufacturer_model_number = fields.Char('厂家型号', size=10)
     remark = fields.Text('备注')
     active = fields.Boolean('有效', default=True)
 
+    
 # 机床
 class MachineTool(models.Model):
     _name = 'sf.machine_tool'
@@ -315,6 +316,7 @@ class MachineToolCategory(models.Model):
     code = fields.Char('编码')
     name = fields.Char('名称')
     remark = fields.Text('备注')
+    active = fields.Boolean('有效', default=True)
     category = fields.Selection([('shukong', u'数控'), ('putong', u'普通')], string=u'机床类别',
                              default='shukong')