From c92442672579ec5b4225e67945aa6b6710bee43c Mon Sep 17 00:00:00 2001
From: "qihao.gong@jikimo.com" <qihao.gong@jikimo.com>
Date: Fri, 18 Aug 2023 14:31:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=93=81=E7=89=8C=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/views/base_view.xml                 | 3 +--
 sf_mrs_connect/models/res_config_setting.py | 6 +++---
 sf_mrs_connect/models/sync_common.py        | 5 ++++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/sf_base/views/base_view.xml b/sf_base/views/base_view.xml
index fa071acc..4425ae13 100644
--- a/sf_base/views/base_view.xml
+++ b/sf_base/views/base_view.xml
@@ -27,9 +27,8 @@
             <tree string="品牌" create="0" edit="0" delete="0">
                 <field name="code"/>
                 <field name="name"/>
-                <field name="manufacturer_model_number"/>
                 <field name="tag_ids" widget="many2many_tags" optional="hide"/>
-                <field name="image_brand"/>
+                <field name="remark"/>
             </tree>
         </field>
     </record>
diff --git a/sf_mrs_connect/models/res_config_setting.py b/sf_mrs_connect/models/res_config_setting.py
index 79ecbbd9..02f30a30 100644
--- a/sf_mrs_connect/models/res_config_setting.py
+++ b/sf_mrs_connect/models/res_config_setting.py
@@ -45,13 +45,13 @@ class ResConfigSettings(models.TransientModel):
             self.env['sf.cutting.tool.material'].sync_all_cutting_tool_material()
             _logger.info("同步所有刀具物料完成")
             _logger.info("同步所有刀具类型...")
-            self.env['sf.cutting.tool.type'].sync_all_tool_type()
-            _logger.info("同步所有刀具类型完成")
+            # self.env['sf.cutting.tool.type'].sync_all_tool_type()
+            # _logger.info("同步所有刀具类型完成")
             _logger.info("定时同步所有功能刀具类型列表...")
             self.env['sf.functional.cutting.tool.model'].sync_all_functional_cutting_tool_model()
             _logger.info("同步所有功能刀具类型完成")
             _logger.info("同步所有刀具型号...")
-            self.env['sf.cutting.tool.model'].sync_all_tool_model()
+            # self.env['sf.cutting.tool.model'].sync_all_tool_model()
             _logger.info("同步所有刀具型号完成")
             _logger.info("同步所有功能刀具列表...")
             self.env['sf.functional.cutting.tool'].sync_all_functional_cutting_tool()
diff --git a/sf_mrs_connect/models/sync_common.py b/sf_mrs_connect/models/sync_common.py
index 583fd6e4..0d2b065c 100644
--- a/sf_mrs_connect/models/sync_common.py
+++ b/sf_mrs_connect/models/sync_common.py
@@ -529,7 +529,8 @@ class MachineBrand(models.Model):
                     brand.code = item['code'],
                     brand.image_brand = '' if not item['image_brand'] else base64.b64encode(item.image_brand),
                     brand.manufacturer_model_number = item['manufacturer_model_number'],
-                    brand.active = item['active']
+                    brand.active = item['active'],
+                    brand.remark = item['remark'],
                 else:
                     self.env['sf.machine.brand'].create({
                         "id": item['id'],
@@ -538,6 +539,7 @@ class MachineBrand(models.Model):
                         "image_brand": '' if not item['image_brand'] else base64.b64encode(item.image_brand),
                         "manufacturer_model_number": item['manufacturer_model_number'],
                         "active": item['active'],
+                        "remark": item['remark'],
 
                     })
         else:
@@ -564,6 +566,7 @@ class MachineBrand(models.Model):
                         "id": item['id'],
                         "name": item['name'],
                         "code": item['code'],
+                        "remark": item['remark'],
                         "manufacturer_model_number": item['manufacturer_model_number'],
                         "image_brand": '' if not item['image_brand'] else base64.b64encode(item.image_brand),
                         "tag_ids": self.env['sf.machine.brand.tags'].search(