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

# Conflicts:
#	sf_mrs_connect/models/res_config_setting.py

sf_manufacturing/models/product_template.py

@@ -154,6 +154,12 @@ class ResProductMo(models.Model):
     fixture_screw_size = fields.Integer(string="螺牙大小(mm)", size=6)
     # 注册状态
     register_state = fields.Selection([('未注册', '未注册'), ('已注册', '已注册'),('注册失败','注册失败')], string='注册状态', default='未注册')
+    industry_code = fields.Char('行业编码', readonly=True)
+
+    @api.onchange('brand_id')
+    def _onchange_brand_id(self):
+        if self.brand_id:
+            self.manufacturer_model_number = self.brand_id.manufacturer_model_number
 
     def _json_apply_machine_tool_type_item_code(self, item):
         code_arr = []