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

# Conflicts:
#	sf_base/views/base_view.xml
#	sf_base/views/common_view.xml
#	sf_tool_management/models/base.py

sf_base/models/common.py

@@ -124,16 +124,16 @@ class MrsProcessingOrder(models.Model):
     production_process_id = fields.Many2one('sf.production.process', string="表面工艺")
 
 
-class Tray(models.Model):
-    _name = 'sf.tray'
-    _description = '托盘'
-
-    code = fields.Char('编码', copy=False)
-    name = fields.Char('名称')
-    state = fields.Selection(
-        [("空闲", "空闲"), ("占用", "占用"), ("报损", "报损")],
-        default="空闲", string="状态")
-    active = fields.Boolean('有效', default=True)
+# class Tray(models.Model):
+#     _name = 'sf.tray'
+#     _description = '托盘'
+#
+#     code = fields.Char('编码', copy=False)
+#     name = fields.Char('名称')
+#     state = fields.Selection(
+#         [("空闲", "空闲"), ("占用", "占用"), ("报损", "报损")],
+#         default="空闲", string="状态")
+#     active = fields.Boolean('有效', default=True)
 
 
 class SupplierSort(models.Model):