From 82322b5024954a299bdf9f075452484d7e2f48ec Mon Sep 17 00:00:00 2001
From: "qihao.gong@jikimo.com" <qihao.gong@jikimo.com>
Date: Mon, 21 Aug 2023 10:27:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BE=E5=A4=87table?=
 =?UTF-8?q?=E5=92=8C=E8=B7=B3=E8=BD=AC=E5=88=B0=E7=BB=B4=E4=BF=9D=20?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=94=B9=E4=B8=BA=E7=BB=B4=E4=BF=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/views/base_view.xml                | 1 +
 sf_maintenance/views/maintenance_views.xml | 7 +++++++
 sf_mrs_connect/models/sync_common.py       | 3 ---
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/sf_base/views/base_view.xml b/sf_base/views/base_view.xml
index 6c4f9660..0607c05d 100644
--- a/sf_base/views/base_view.xml
+++ b/sf_base/views/base_view.xml
@@ -92,6 +92,7 @@
             <tree string="机床型号" create="0" delete="0" edit="0">
                 <field name="code"/>
                 <field name="name" string="名称"/>
+                <field name="machine_tool_category"/>
                 <field name="brand_id"/>
                 <field name="remark"/>
                 <field name="machine_tool_picture" widget="image"/>
diff --git a/sf_maintenance/views/maintenance_views.xml b/sf_maintenance/views/maintenance_views.xml
index 39f6a316..ad267a54 100644
--- a/sf_maintenance/views/maintenance_views.xml
+++ b/sf_maintenance/views/maintenance_views.xml
@@ -25,6 +25,13 @@
                         <field name="state" widget="statusbar" options="{'clickable': '1'}"/>
                     </header>
                 </xpath>
+                <xpath expr="//page[@name='maintenance']" position="attributes">
+                <attribute name="string">维保</attribute>
+                </xpath>
+                <xpath expr="//field[@name='maintenance_count']" position="attributes">
+                <attribute name="string">维保</attribute>
+                </xpath>
+<!--                <field string="Maintenance" name="maintenance_count" widget="statinfo"/>-->
                 <xpath expr="//div[@name='button_box']" position="inside">
 
                     <button name="%(action_maintenance_logs)d"
diff --git a/sf_mrs_connect/models/sync_common.py b/sf_mrs_connect/models/sync_common.py
index cf59a5ce..25f6974a 100644
--- a/sf_mrs_connect/models/sync_common.py
+++ b/sf_mrs_connect/models/sync_common.py
@@ -528,7 +528,6 @@ class MachineBrand(models.Model):
                     brand.name = item['name'],
                     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.remark = item['remark'],
                 else:
@@ -537,7 +536,6 @@ class MachineBrand(models.Model):
                         "name": item['name'],
                         "code": item['code'],
                         "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'],
 
@@ -567,7 +565,6 @@ class MachineBrand(models.Model):
                         "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(
                             [("name", 'in', item['tag_ids'])]).ids