Merge remote-tracking branch 'origin/feature/新增中控对接接口' into feature/接口及CAM用刀

# Conflicts:
#	sf_tool_management/models/base.py

sf_manufacturing/models/mrp_workorder.py

@@ -597,6 +597,7 @@ class CNCprocessing(models.Model):
     cnc_id = fields.Many2one('ir.attachment')
     sequence_number = fields.Char('序号')
     program_name = fields.Char('程序名')
+    functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型')
     cutting_tool_name = fields.Char('刀具名称')
     cutting_tool_no = fields.Char('刀号')
     processing_type = fields.Char('加工类型')