Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库（10.11）

# Conflicts:
#	sf_mrs_connect/models/sync_common.py

sf_base/models/common.py

@@ -67,7 +67,12 @@ class MrsMaterialModel(models.Model):
     mf_materia_post = fields.Char("热处理后密度")
     density = fields.Float("密度(kg/m³)")
     materials_id = fields.Many2one('sf.production.materials', "材料名")
-    tensile_strength = fields.Float("拉伸强度(n/mm²)")
+    tensile_strength = fields.Char("拉伸强度(n/mm²)")
+    standards_id = fields.Many2one('sf.international.standards', '制造标准')
+    alloy_code = fields.Char('合金牌号')
+    price = fields.Float('单价/kg')
+    apply = fields.Many2many('material.apply', string='材料应用')
+    materials_code = fields.Char('材料代号')
     hardness = fields.Float("硬度(hrc)")
     rough_machining = fields.Float("粗加工Vc(m/min)")
     finish_machining = fields.Float("精加工Vc(m/min)")
@@ -97,7 +102,7 @@ class MrsProductionProcess(models.Model):
     _name = 'sf.production.process'
     _description = '表面工艺'
 
-    process_encode = fields.Char("编码")
+    code = fields.Char("编码")
     name = fields.Char('名称')
     remark = fields.Text("备注")
     processing_order_ids = fields.One2many('sf.processing.order', 'production_process_id', string='工序')
@@ -114,7 +119,7 @@ class MrsProcessingTechnology(models.Model):
 
     name = fields.Char('名称', index=True)
     remark = fields.Text('备注', index=True)
-    process_encode = fields.Char("编码")
+    code = fields.Char("编码")
     processing_order_ids = fields.Many2many('sf.processing.order', 'sf_associated_processes',
                                             index=True, string='工序')
     active = fields.Boolean('有效', default=True)
@@ -173,3 +178,20 @@ class MrsProductionProcessParameter(models.Model):
         for i in item.parameter_ids:
             code_arr.append(i.code)
         return code_arr
+
+
+class ModelInternationalStandards(models.Model):
+    _name = 'sf.international.standards'
+    _description = '制造标准'
+
+    code = fields.Char('编码')
+    name = fields.Char('名称')
+    active = fields.Boolean('有效', default=True)
+
+
+class MrsMaterialApply(models.Model):
+    _name = 'material.apply'
+    _description = '材料应用'
+
+    name = fields.Char('名称', default=True)
+    active = fields.Boolean('有效', default=True)