From 76293f5cca2c2d91ccc2bc9aebb835f76786ef32 Mon Sep 17 00:00:00 2001 From: "qihao.gong@jikimo.com" Date: Mon, 21 Aug 2023 17:22:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=B4=E4=BF=9Dtable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_maintenance/views/maintenance_request_views.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 @@ - + From b01a5a4216611b8f572f483f51ab2c24b8f90470 Mon Sep 17 00:00:00 2001 From: "qihao.gong@jikimo.com" Date: Wed, 23 Aug 2023 14:37:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=80=E6=8A=8A=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=96=B0=E5=A2=9Ebt50=20=E4=BF=AE=E6=94=B9=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E5=93=81=E7=89=8C=E5=9B=BE=E7=89=87=E6=8A=A5=E9=94=99=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_base/models/base.py | 2 +- sf_base/views/base_view.xml | 1 + sf_mrs_connect/models/sync_common.py | 7 ++++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/sf_base/models/base.py b/sf_base/models/base.py index bb225b9b..a340aaca 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 88a2dd86..eff588a4 100644 --- a/sf_base/views/base_view.xml +++ b/sf_base/views/base_view.xml @@ -30,6 +30,7 @@ + diff --git a/sf_mrs_connect/models/sync_common.py b/sf_mrs_connect/models/sync_common.py index 6c2003ff..a9ea2c24 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 })