diff --git a/sf_base/models/base.py b/sf_base/models/base.py
index 02c569ba..ef7a89fb 100644
--- a/sf_base/models/base.py
+++ b/sf_base/models/base.py
@@ -256,7 +256,7 @@ class MachineToolType(models.Model):
name = fields.Char('名称')
brand_id = fields.Many2one('sf.machine.brand', string='品牌')
knife_type = fields.Selection(
- [("BT40", "BT40"), ("BT30", "BT30")],
+ [("BT40", "BT40"), ("BT30", "BT30"), ("BT50", "BT50")],
default="", string="刀把类型")
number_of_knife_library = fields.Integer('刀库数量')
rotate_speed = fields.Integer('转速')
diff --git a/sf_base/views/base_view.xml b/sf_base/views/base_view.xml
index 4e7e5290..cdff5a4b 100644
--- a/sf_base/views/base_view.xml
+++ b/sf_base/views/base_view.xml
@@ -30,6 +30,7 @@
+
diff --git a/sf_maintenance/views/maintenance_request_views.xml b/sf_maintenance/views/maintenance_request_views.xml
index c942deac..39c82384 100644
--- a/sf_maintenance/views/maintenance_request_views.xml
+++ b/sf_maintenance/views/maintenance_request_views.xml
@@ -21,7 +21,7 @@
-
+
diff --git a/sf_mrs_connect/models/sync_common.py b/sf_mrs_connect/models/sync_common.py
index 892a2eed..e752c483 100644
--- a/sf_mrs_connect/models/sync_common.py
+++ b/sf_mrs_connect/models/sync_common.py
@@ -569,15 +569,20 @@ class MachineBrand(models.Model):
result = json.loads(r['result'])
if result['status'] == 1:
for item in result['machine_brand_all_list']:
+
brand = self.env['sf.machine.brand'].search(
[("code", '=', item['code'])])
if not brand:
+ if item.get('image_brand'):
+ image = base64.b64decode(item['image_brand'])
+ else:
+ image = ''
self.env['sf.machine.brand'].create({
"id": item['id'],
"name": item['name'],
"code": item['code'],
"remark": item['remark'],
- "image_brand": '' if not item['image_brand'] else base64.b64encode(item.image_brand),
+ "image_brand": image,
"tag_ids": self.env['sf.machine.brand.tags'].search(
[("name", 'in', item['tag_ids'])]).ids
})