Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug

# Conflicts:
#	sf_manufacturing/models/stock.py

sf_base/models/base.py

@@ -39,7 +39,7 @@ class MachineBrand(models.Model):
     remark = fields.Text('备注')
     active = fields.Boolean('有效', default=True)
 
-    
+
 # 机床
 class MachineTool(models.Model):
     _name = 'sf.machine_tool'
@@ -86,7 +86,7 @@ class MachineTool(models.Model):
     state = fields.Selection(
         [("正常", "正常"), ("故障", "故障"), ("不可用", "不可用")],
         default='正常', string="机床状态")
-    #0606新增字段
+    # 0606新增字段
     machine_tool_picture = fields.Binary('图片')
     heightened_way = fields.Selection([
         ('sifudianji', '伺服电机驱动'),
@@ -260,7 +260,7 @@ class MachineToolType(models.Model):
         default="", string="刀把类型")
     number_of_knife_library = fields.Integer('刀库数量')
     rotate_speed = fields.Integer('转速')
-    #0606新增字段
+    # 0606新增字段
     created_user = fields.Many2one('res.users', string='创建人', default=lambda self: self.env.user)
     machine_tool_picture = fields.Binary('图片')
     heightened_way = fields.Selection([
@@ -326,5 +326,4 @@ class MachineToolCategory(models.Model):
     remark = fields.Text('备注')
     active = fields.Boolean('有效', default=True)
     category = fields.Selection([('shukong', u'数控'), ('putong', u'普通')], string=u'机床类别',
-                             default='shukong')
-
+                                default='shukong')

sf_base/models/tool_other_features.py

@@ -340,7 +340,7 @@ class FeedPerTooth(models.Model):
     cutting_speed = fields.Char('径向切宽 ae(mm)')
     machining_method = fields.Selection([('直铣', '直铣'), ('坡铣', '坡铣')], string='加工方式')
     materials_type_id = fields.Many2one('sf.materials.model', string='材料型号')
-    blade_diameter = fields.Char('刃部直径(mm)', readonly=True)
+    blade_diameter = fields.Integer('刃部直径(mm)', readonly=True)
     feed_per_tooth = fields.Char('每齿走刀量 (mm/z)')
 
     def _json_feed_per_tooth(self, obj):