From 0fa2656aad6902c19090a2fa37c1de121f52217a Mon Sep 17 00:00:00 2001
From: yuxianghui <1608204036@qq.com>
Date: Mon, 21 Aug 2023 10:11:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=88=80=E5=85=B7=E7=9A=84=E5=88=80=E5=85=B7=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_tool_management/models/base.py            | 120 +++----
 sf_tool_management/views/tool_base_views.xml | 344 ++++++++++++-------
 2 files changed, 288 insertions(+), 176 deletions(-)

diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py
index f780dad9..d39b92fa 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -52,18 +52,18 @@ class FunctionalCuttingToolEntity(models.Model):
                                                              'sf_functional_cutting_tool_entity_id',
                                                              string='夹头型号', domain=
                                                              [('cutting_tool_type', '=', '夹头')])
-    cutting_tool_material = fields.Selection([('0', '整体式刀具'), ('1', '组合式刀具')], string='刀具物料', default='0')
-
-    @api.onchange('cutting_tool_material')
-    def _onchange_cutting_tool_material(self):
-        for record in self:
-            if record:
-                if record.cutting_tool_material == '1':
-                    record.mrs_cutting_tool_integral_model_ids = None
-                if record.cutting_tool_material == '0':
-                    record.mrs_cutting_tool_blade_model_ids = None
-                    record.mrs_cutting_tool_cutterbar_model_ids = None
-                    record.mrs_cutting_tool_cutterpad_model_ids = None
+    # cutting_tool_material = fields.Selection([('0', '整体式刀具'), ('1', '组合式刀具')], string='刀具物料', default='0')
+    #
+    # @api.onchange('cutting_tool_material')
+    # def _onchange_cutting_tool_material(self):
+    #     for record in self:
+    #         if record:
+    #             if record.cutting_tool_material == '1':
+    #                 record.mrs_cutting_tool_integral_model_ids = None
+    #             if record.cutting_tool_material == '0':
+    #                 record.mrs_cutting_tool_blade_model_ids = None
+    #                 record.mrs_cutting_tool_cutterbar_model_ids = None
+    #                 record.mrs_cutting_tool_cutterpad_model_ids = None
 
 
     diameter = fields.Float('直径(mm)')
@@ -126,18 +126,18 @@ class FunctionalCuttingToolEntityCache(models.Model):
                                                              'sf_functional_cutting_tool_entity_cache_id',
                                                              string='夹头型号', domain=
                                                              [('cutting_tool_type', '=', '夹头')])
-    cutting_tool_material = fields.Selection([('0', '整体式刀具'), ('1', '组合式刀具')], string='刀具物料', default='0')
-
-    @api.onchange('cutting_tool_material')
-    def _onchange_cutting_tool_material(self):
-        for record in self:
-            if record:
-                if record.cutting_tool_material == '1':
-                    record.mrs_cutting_tool_integral_model_ids = None
-                if record.cutting_tool_material == '0':
-                    record.mrs_cutting_tool_blade_model_ids = None
-                    record.mrs_cutting_tool_cutterbar_model_ids = None
-                    record.mrs_cutting_tool_cutterpad_model_ids = None
+    # cutting_tool_material = fields.Selection([('0', '整体式刀具'), ('1', '组合式刀具')], string='刀具物料', default='0')
+    #
+    # @api.onchange('cutting_tool_material')
+    # def _onchange_cutting_tool_material(self):
+    #     for record in self:
+    #         if record:
+    #             if record.cutting_tool_material == '1':
+    #                 record.mrs_cutting_tool_integral_model_ids = None
+    #             if record.cutting_tool_material == '0':
+    #                 record.mrs_cutting_tool_blade_model_ids = None
+    #                 record.mrs_cutting_tool_cutterbar_model_ids = None
+    #                 record.mrs_cutting_tool_cutterpad_model_ids = None
 
 
     diameter = fields.Float('直径(mm)')
@@ -203,18 +203,18 @@ class FunctionalToolWarning(models.Model):
                                                              string='夹头型号', readonly=True,
                                                              domain=[('cutting_tool_type', '=', '夹头')],
                                                              related='functional_cutting_tool_id.mrs_cutting_tool_cutterhead_model_ids')
-    cutting_tool_material = fields.Selection([('0', '整体式刀具'), ('1', '组合式刀具')], string='刀具物料', default='0')
-
-    @api.onchange('cutting_tool_material')
-    def _onchange_cutting_tool_material(self):
-        for record in self:
-            if record:
-                if record.cutting_tool_material == '1':
-                    record.mrs_cutting_tool_integral_model_ids = None
-                if record.cutting_tool_material == '0':
-                    record.mrs_cutting_tool_blade_model_ids = None
-                    record.mrs_cutting_tool_cutterbar_model_ids = None
-                    record.mrs_cutting_tool_cutterpad_model_ids = None
+    # cutting_tool_material = fields.Selection([('0', '整体式刀具'), ('1', '组合式刀具')], string='刀具物料', default='0')
+    #
+    # @api.onchange('cutting_tool_material')
+    # def _onchange_cutting_tool_material(self):
+    #     for record in self:
+    #         if record:
+    #             if record.cutting_tool_material == '1':
+    #                 record.mrs_cutting_tool_integral_model_ids = None
+    #             if record.cutting_tool_material == '0':
+    #                 record.mrs_cutting_tool_blade_model_ids = None
+    #                 record.mrs_cutting_tool_cutterbar_model_ids = None
+    #                 record.mrs_cutting_tool_cutterpad_model_ids = None
 
     diameter = fields.Float('直径(mm)', readonly=True, related='functional_cutting_tool_id.diameter')
     tool_grade = fields.Selection([('1', 'P1'), ('2', 'P2'), ('3', 'P3'), ('4', 'P4'), ('5', 'P5'), ('6', 'P6')],
@@ -329,18 +329,18 @@ class RealTimeDistributionOfFunctionalTools(models.Model):
                                                              string='夹头型号', readonly=True,
                                                              domain=[('cutting_tool_type', '=', '夹头')],
                                                              related='functional_cutting_tool_id.mrs_cutting_tool_cutterhead_model_ids')
-    cutting_tool_material = fields.Selection([('0', '整体式刀具'), ('1', '组合式刀具')], string='刀具物料', default='0')
-
-    @api.onchange('cutting_tool_material')
-    def _onchange_cutting_tool_material(self):
-        for record in self:
-            if record:
-                if record.cutting_tool_material == '1':
-                    record.mrs_cutting_tool_integral_model_ids = None
-                if record.cutting_tool_material == '0':
-                    record.mrs_cutting_tool_blade_model_ids = None
-                    record.mrs_cutting_tool_cutterbar_model_ids = None
-                    record.mrs_cutting_tool_cutterpad_model_ids = None
+    # cutting_tool_material = fields.Selection([('0', '整体式刀具'), ('1', '组合式刀具')], string='刀具物料', default='0')
+    #
+    # @api.onchange('cutting_tool_material')
+    # def _onchange_cutting_tool_material(self):
+    #     for record in self:
+    #         if record:
+    #             if record.cutting_tool_material == '1':
+    #                 record.mrs_cutting_tool_integral_model_ids = None
+    #             if record.cutting_tool_material == '0':
+    #                 record.mrs_cutting_tool_blade_model_ids = None
+    #                 record.mrs_cutting_tool_cutterbar_model_ids = None
+    #                 record.mrs_cutting_tool_cutterpad_model_ids = None
 
     diameter = fields.Float('直径(mm)', readonly=True, related='functional_cutting_tool_id.diameter')
     tool_grade = fields.Selection([('1', 'P1'), ('2', 'P2'), ('3', 'P3'), ('4', 'P4'), ('5', 'P5'), ('6', 'P6')],
@@ -450,18 +450,18 @@ class InboundAndOutboundRecordsOfFunctionalTools(models.Model):
                                                              string='夹头型号', readonly=True,
                                                              domain=[('cutting_tool_type', '=', '夹头')],
                                                              related='functional_cutting_tool_id.mrs_cutting_tool_cutterhead_model_ids')
-    cutting_tool_material = fields.Selection([('0', '整体式刀具'), ('1', '组合式刀具')], string='刀具物料', default='0')
-
-    @api.onchange('cutting_tool_material')
-    def _onchange_cutting_tool_material(self):
-        for record in self:
-            if record:
-                if record.cutting_tool_material == '1':
-                    record.mrs_cutting_tool_integral_model_ids = None
-                if record.cutting_tool_material == '0':
-                    record.mrs_cutting_tool_blade_model_ids = None
-                    record.mrs_cutting_tool_cutterbar_model_ids = None
-                    record.mrs_cutting_tool_cutterpad_model_ids = None
+    # cutting_tool_material = fields.Selection([('0', '整体式刀具'), ('1', '组合式刀具')], string='刀具物料', default='0')
+    #
+    # @api.onchange('cutting_tool_material')
+    # def _onchange_cutting_tool_material(self):
+    #     for record in self:
+    #         if record:
+    #             if record.cutting_tool_material == '1':
+    #                 record.mrs_cutting_tool_integral_model_ids = None
+    #             if record.cutting_tool_material == '0':
+    #                 record.mrs_cutting_tool_blade_model_ids = None
+    #                 record.mrs_cutting_tool_cutterbar_model_ids = None
+    #                 record.mrs_cutting_tool_cutterpad_model_ids = None
 
     diameter = fields.Float('直径(mm)', readonly=True, related='functional_cutting_tool_id.diameter')
     tool_grade = fields.Selection([('1', 'P1'), ('2', 'P2'), ('3', 'P3'), ('4', 'P4'), ('5', 'P5'), ('6', 'P6')],
diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml
index 02ab3ce6..361ea14a 100644
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -35,36 +35,64 @@
                         <group>
                             <group>
                                 <field name="name" invisible="True"/>
-<!--                                <field name="functional_cutting_tool_id"/>-->
                                 <field name="mrs_cutting_tool_type_id"/>
-                                <field name="cutting_tool_material" required="1" widget="radio"
-                                           options="{'horizontal': true}"/>
-                                    <field name="mrs_cutting_tool_integral_model_ids"
-                                           options="{'no_create': True, 'no_quick_create': True}"
-                                           widget="many2many_tags"
-                                           attrs="{'invisible': [('cutting_tool_material', '!=', '0')]}"
-                                    />
-                                    <field name="mrs_cutting_tool_blade_model_ids"
-                                           options="{'no_create': True, 'no_quick_create': True}"
-                                           widget="many2many_tags"
-                                           attrs="{'invisible': [('cutting_tool_material', '!=', '1')]}"
-                                    />
-                                    <field name="mrs_cutting_tool_cutterbar_model_ids"
-                                           options="{'no_create': True, 'no_quick_create': True}"
-                                           widget="many2many_tags"
-                                           attrs="{'invisible': ['|',('mrs_cutting_tool_cutterpad_model_ids','!=',[]),('cutting_tool_material', '!=', '1')]}"
-                                    />
-                                    <field name="mrs_cutting_tool_cutterpad_model_ids"
-                                           options="{'no_create': True, 'no_quick_create': True}"
-                                           widget="many2many_tags"
-                                           attrs="{'invisible': ['|',('mrs_cutting_tool_cutterbar_model_ids','!=',[]),('cutting_tool_material', '!=', '1')]}"
-                                    />
-                                    <field name="mrs_cutting_tool_cutterhandle_model_ids"
-                                           options="{'no_create': True, 'no_quick_create': True}"
-                                           widget="many2many_tags"/>
-                                    <field name="mrs_cutting_tool_cutterhead_model_ids"
-                                           options="{'no_create': True, 'no_quick_create': True}"
-                                           widget="many2many_tags"/>
+
+                                <field name="mrs_cutting_tool_integral_model_ids"
+                                       options="{'no_create': True, 'no_quick_create': True}"
+                                       widget="many2many_tags"
+                                       attrs="{'invisible': [('mrs_cutting_tool_blade_model_ids', '!=', [])]}"
+                                />
+                                <field name="mrs_cutting_tool_blade_model_ids"
+                                       options="{'no_create': True, 'no_quick_create': True}"
+                                       widget="many2many_tags"
+                                       attrs="{'invisible': [('mrs_cutting_tool_integral_model_ids', '!=', [])]}"
+                                />
+                                <field name="mrs_cutting_tool_cutterbar_model_ids"
+                                       options="{'no_create': True, 'no_quick_create': True}"
+                                       widget="many2many_tags"
+                                       attrs="{'invisible': ['|',('mrs_cutting_tool_cutterpad_model_ids','!=',[]),('mrs_cutting_tool_blade_model_ids', '=', [])]}"
+                                />
+                                <field name="mrs_cutting_tool_cutterpad_model_ids"
+                                       options="{'no_create': True, 'no_quick_create': True}"
+                                       widget="many2many_tags"
+                                       attrs="{'invisible': ['|',('mrs_cutting_tool_cutterbar_model_ids','!=',[]),('mrs_cutting_tool_blade_model_ids', '=', [])]}"
+                                />
+                                <field name="mrs_cutting_tool_cutterhandle_model_ids"
+                                       options="{'no_create': True, 'no_quick_create': True}"
+                                       widget="many2many_tags"/>
+                                <field name="mrs_cutting_tool_cutterhead_model_ids"
+                                       options="{'no_create': True, 'no_quick_create': True}"
+                                       widget="many2many_tags"/>
+<!--                                <field name="functional_cutting_tool_id"/>-->
+<!--                                <field name="cutting_tool_material" required="1" widget="radio"-->
+<!--                                           options="{'horizontal': true}"/>-->
+<!--                                <field name="mrs_cutting_tool_integral_model_ids"-->
+<!--                                       options="{'no_create': True, 'no_quick_create': True}"-->
+<!--                                       widget="many2many_tags"-->
+<!--                                       attrs="{'invisible': [('cutting_tool_material', '!=', '0')]}"-->
+<!--                                />-->
+<!--                                <field name="mrs_cutting_tool_blade_model_ids"-->
+<!--                                       options="{'no_create': True, 'no_quick_create': True}"-->
+<!--                                       widget="many2many_tags"-->
+<!--                                       attrs="{'invisible': [('cutting_tool_material', '!=', '1')]}"-->
+<!--                                />-->
+<!--                                <field name="mrs_cutting_tool_cutterbar_model_ids"-->
+<!--                                       options="{'no_create': True, 'no_quick_create': True}"-->
+<!--                                       widget="many2many_tags"-->
+<!--                                       attrs="{'invisible': ['|',('mrs_cutting_tool_cutterpad_model_ids','!=',[]),('cutting_tool_material', '!=', '1')]}"-->
+<!--                                />-->
+<!--                                <field name="mrs_cutting_tool_cutterpad_model_ids"-->
+<!--                                       options="{'no_create': True, 'no_quick_create': True}"-->
+<!--                                       widget="many2many_tags"-->
+<!--                                       attrs="{'invisible': ['|',('mrs_cutting_tool_cutterbar_model_ids','!=',[]),('cutting_tool_material', '!=', '1')]}"-->
+<!--                                />-->
+<!--                                <field name="mrs_cutting_tool_cutterhandle_model_ids"-->
+<!--                                       options="{'no_create': True, 'no_quick_create': True}"-->
+<!--                                       widget="many2many_tags"/>-->
+<!--                                <field name="mrs_cutting_tool_cutterhead_model_ids"-->
+<!--                                       options="{'no_create': True, 'no_quick_create': True}"-->
+<!--                                       widget="many2many_tags"/>-->
+
                             </group>
                             <group>
                                 <field name="image" nolabel="1" widget="image"/>
@@ -166,36 +194,64 @@
                         <group>
                             <group>
                                 <field name="name" invisible="True"/>
-<!--                                <field name="functional_cutting_tool_id"/>-->
                                 <field name="mrs_cutting_tool_type_id"/>
-                                <field name="cutting_tool_material" required="1" widget="radio"
-                                           options="{'horizontal': true}"/>
-                                    <field name="mrs_cutting_tool_integral_model_ids"
-                                           options="{'no_create': True, 'no_quick_create': True}"
-                                           widget="many2many_tags"
-                                           attrs="{'invisible': [('cutting_tool_material', '!=', '0')]}"
-                                    />
-                                    <field name="mrs_cutting_tool_blade_model_ids"
-                                           options="{'no_create': True, 'no_quick_create': True}"
-                                           widget="many2many_tags"
-                                           attrs="{'invisible': [('cutting_tool_material', '!=', '1')]}"
-                                    />
-                                    <field name="mrs_cutting_tool_cutterbar_model_ids"
-                                           options="{'no_create': True, 'no_quick_create': True}"
-                                           widget="many2many_tags"
-                                           attrs="{'invisible': ['|',('mrs_cutting_tool_cutterpad_model_ids','!=',[]),('cutting_tool_material', '!=', '1')]}"
-                                    />
-                                    <field name="mrs_cutting_tool_cutterpad_model_ids"
-                                           options="{'no_create': True, 'no_quick_create': True}"
-                                           widget="many2many_tags"
-                                           attrs="{'invisible': ['|',('mrs_cutting_tool_cutterbar_model_ids','!=',[]),('cutting_tool_material', '!=', '1')]}"
-                                    />
-                                    <field name="mrs_cutting_tool_cutterhandle_model_ids"
-                                           options="{'no_create': True, 'no_quick_create': True}"
-                                           widget="many2many_tags"/>
-                                    <field name="mrs_cutting_tool_cutterhead_model_ids"
-                                           options="{'no_create': True, 'no_quick_create': True}"
-                                           widget="many2many_tags"/>
+
+                                <field name="mrs_cutting_tool_integral_model_ids"
+                                       options="{'no_create': True, 'no_quick_create': True}"
+                                       widget="many2many_tags"
+                                       attrs="{'invisible': [('mrs_cutting_tool_blade_model_ids', '!=', [])]}"
+                                />
+                                <field name="mrs_cutting_tool_blade_model_ids"
+                                       options="{'no_create': True, 'no_quick_create': True}"
+                                       widget="many2many_tags"
+                                       attrs="{'invisible': [('mrs_cutting_tool_integral_model_ids', '!=', [])]}"
+                                />
+                                <field name="mrs_cutting_tool_cutterbar_model_ids"
+                                       options="{'no_create': True, 'no_quick_create': True}"
+                                       widget="many2many_tags"
+                                       attrs="{'invisible': ['|',('mrs_cutting_tool_cutterpad_model_ids','!=',[]),('mrs_cutting_tool_blade_model_ids', '=', [])]}"
+                                />
+                                <field name="mrs_cutting_tool_cutterpad_model_ids"
+                                       options="{'no_create': True, 'no_quick_create': True}"
+                                       widget="many2many_tags"
+                                       attrs="{'invisible': ['|',('mrs_cutting_tool_cutterbar_model_ids','!=',[]),('mrs_cutting_tool_blade_model_ids', '=', [])]}"
+                                />
+                                <field name="mrs_cutting_tool_cutterhandle_model_ids"
+                                       options="{'no_create': True, 'no_quick_create': True}"
+                                       widget="many2many_tags"/>
+                                <field name="mrs_cutting_tool_cutterhead_model_ids"
+                                       options="{'no_create': True, 'no_quick_create': True}"
+                                       widget="many2many_tags"/>
+<!--                                <field name="functional_cutting_tool_id"/>-->
+<!--                                <field name="cutting_tool_material" required="1" widget="radio"-->
+<!--                                           options="{'horizontal': true}"/>-->
+<!--                                <field name="mrs_cutting_tool_integral_model_ids"-->
+<!--                                       options="{'no_create': True, 'no_quick_create': True}"-->
+<!--                                       widget="many2many_tags"-->
+<!--                                       attrs="{'invisible': [('cutting_tool_material', '!=', '0')]}"-->
+<!--                                />-->
+<!--                                <field name="mrs_cutting_tool_blade_model_ids"-->
+<!--                                       options="{'no_create': True, 'no_quick_create': True}"-->
+<!--                                       widget="many2many_tags"-->
+<!--                                       attrs="{'invisible': [('cutting_tool_material', '!=', '1')]}"-->
+<!--                                />-->
+<!--                                <field name="mrs_cutting_tool_cutterbar_model_ids"-->
+<!--                                       options="{'no_create': True, 'no_quick_create': True}"-->
+<!--                                       widget="many2many_tags"-->
+<!--                                       attrs="{'invisible': ['|',('mrs_cutting_tool_cutterpad_model_ids','!=',[]),('cutting_tool_material', '!=', '1')]}"-->
+<!--                                />-->
+<!--                                <field name="mrs_cutting_tool_cutterpad_model_ids"-->
+<!--                                       options="{'no_create': True, 'no_quick_create': True}"-->
+<!--                                       widget="many2many_tags"-->
+<!--                                       attrs="{'invisible': ['|',('mrs_cutting_tool_cutterbar_model_ids','!=',[]),('cutting_tool_material', '!=', '1')]}"-->
+<!--                                />-->
+<!--                                <field name="mrs_cutting_tool_cutterhandle_model_ids"-->
+<!--                                       options="{'no_create': True, 'no_quick_create': True}"-->
+<!--                                       widget="many2many_tags"/>-->
+<!--                                <field name="mrs_cutting_tool_cutterhead_model_ids"-->
+<!--                                       options="{'no_create': True, 'no_quick_create': True}"-->
+<!--                                       widget="many2many_tags"/>-->
+
                             </group>
                             <group>
                                 <field name="image" nolabel="1" widget="image"/>
@@ -335,36 +391,64 @@
                         <group>
                             <group>
                                 <field name="name" invisible="True"/>
-                                <field name="functional_cutting_tool_id"/>
                                 <field name="mrs_cutting_tool_type_id"/>
-                                <field name="cutting_tool_material" required="1" widget="radio"
-                                           options="{'horizontal': true}"/>
-                                    <field name="mrs_cutting_tool_integral_model_ids"
-                                           options="{'no_create': True, 'no_quick_create': True}"
-                                           widget="many2many_tags"
-                                           attrs="{'invisible': [('cutting_tool_material', '!=', '0')]}"
-                                    />
-                                    <field name="mrs_cutting_tool_blade_model_ids"
-                                           options="{'no_create': True, 'no_quick_create': True}"
-                                           widget="many2many_tags"
-                                           attrs="{'invisible': [('cutting_tool_material', '!=', '1')]}"
-                                    />
-                                    <field name="mrs_cutting_tool_cutterbar_model_ids"
-                                           options="{'no_create': True, 'no_quick_create': True}"
-                                           widget="many2many_tags"
-                                           attrs="{'invisible': ['|',('mrs_cutting_tool_cutterpad_model_ids','!=',[]),('cutting_tool_material', '!=', '1')]}"
-                                    />
-                                    <field name="mrs_cutting_tool_cutterpad_model_ids"
-                                           options="{'no_create': True, 'no_quick_create': True}"
-                                           widget="many2many_tags"
-                                           attrs="{'invisible': ['|',('mrs_cutting_tool_cutterbar_model_ids','!=',[]),('cutting_tool_material', '!=', '1')]}"
-                                    />
-                                    <field name="mrs_cutting_tool_cutterhandle_model_ids"
-                                           options="{'no_create': True, 'no_quick_create': True}"
-                                           widget="many2many_tags"/>
-                                    <field name="mrs_cutting_tool_cutterhead_model_ids"
-                                           options="{'no_create': True, 'no_quick_create': True}"
-                                           widget="many2many_tags"/>
+
+                                <field name="mrs_cutting_tool_integral_model_ids"
+                                       options="{'no_create': True, 'no_quick_create': True}"
+                                       widget="many2many_tags"
+                                       attrs="{'invisible': [('mrs_cutting_tool_blade_model_ids', '!=', [])]}"
+                                />
+                                <field name="mrs_cutting_tool_blade_model_ids"
+                                       options="{'no_create': True, 'no_quick_create': True}"
+                                       widget="many2many_tags"
+                                       attrs="{'invisible': [('mrs_cutting_tool_integral_model_ids', '!=', [])]}"
+                                />
+                                <field name="mrs_cutting_tool_cutterbar_model_ids"
+                                       options="{'no_create': True, 'no_quick_create': True}"
+                                       widget="many2many_tags"
+                                       attrs="{'invisible': ['|',('mrs_cutting_tool_cutterpad_model_ids','!=',[]),('mrs_cutting_tool_blade_model_ids', '=', [])]}"
+                                />
+                                <field name="mrs_cutting_tool_cutterpad_model_ids"
+                                       options="{'no_create': True, 'no_quick_create': True}"
+                                       widget="many2many_tags"
+                                       attrs="{'invisible': ['|',('mrs_cutting_tool_cutterbar_model_ids','!=',[]),('mrs_cutting_tool_blade_model_ids', '=', [])]}"
+                                />
+                                <field name="mrs_cutting_tool_cutterhandle_model_ids"
+                                       options="{'no_create': True, 'no_quick_create': True}"
+                                       widget="many2many_tags"/>
+                                <field name="mrs_cutting_tool_cutterhead_model_ids"
+                                       options="{'no_create': True, 'no_quick_create': True}"
+                                       widget="many2many_tags"/>
+<!--                                <field name="functional_cutting_tool_id"/>-->
+<!--                                <field name="cutting_tool_material" required="1" widget="radio"-->
+<!--                                           options="{'horizontal': true}"/>-->
+<!--                                <field name="mrs_cutting_tool_integral_model_ids"-->
+<!--                                       options="{'no_create': True, 'no_quick_create': True}"-->
+<!--                                       widget="many2many_tags"-->
+<!--                                       attrs="{'invisible': [('cutting_tool_material', '!=', '0')]}"-->
+<!--                                />-->
+<!--                                <field name="mrs_cutting_tool_blade_model_ids"-->
+<!--                                       options="{'no_create': True, 'no_quick_create': True}"-->
+<!--                                       widget="many2many_tags"-->
+<!--                                       attrs="{'invisible': [('cutting_tool_material', '!=', '1')]}"-->
+<!--                                />-->
+<!--                                <field name="mrs_cutting_tool_cutterbar_model_ids"-->
+<!--                                       options="{'no_create': True, 'no_quick_create': True}"-->
+<!--                                       widget="many2many_tags"-->
+<!--                                       attrs="{'invisible': ['|',('mrs_cutting_tool_cutterpad_model_ids','!=',[]),('cutting_tool_material', '!=', '1')]}"-->
+<!--                                />-->
+<!--                                <field name="mrs_cutting_tool_cutterpad_model_ids"-->
+<!--                                       options="{'no_create': True, 'no_quick_create': True}"-->
+<!--                                       widget="many2many_tags"-->
+<!--                                       attrs="{'invisible': ['|',('mrs_cutting_tool_cutterbar_model_ids','!=',[]),('cutting_tool_material', '!=', '1')]}"-->
+<!--                                />-->
+<!--                                <field name="mrs_cutting_tool_cutterhandle_model_ids"-->
+<!--                                       options="{'no_create': True, 'no_quick_create': True}"-->
+<!--                                       widget="many2many_tags"/>-->
+<!--                                <field name="mrs_cutting_tool_cutterhead_model_ids"-->
+<!--                                       options="{'no_create': True, 'no_quick_create': True}"-->
+<!--                                       widget="many2many_tags"/>-->
+
                             </group>
                             <group>
                                 <field name="image" nolabel="1" widget="image"/>
@@ -492,36 +576,64 @@
                         <group>
                             <group>
                                 <field name="name" invisible="True"/>
-                                <field name="functional_cutting_tool_id"/>
                                 <field name="mrs_cutting_tool_type_id"/>
-                                <field name="cutting_tool_material" required="1" widget="radio"
-                                           options="{'horizontal': true}"/>
-                                    <field name="mrs_cutting_tool_integral_model_ids"
-                                           options="{'no_create': True, 'no_quick_create': True}"
-                                           widget="many2many_tags"
-                                           attrs="{'invisible': [('cutting_tool_material', '!=', '0')]}"
-                                    />
-                                    <field name="mrs_cutting_tool_blade_model_ids"
-                                           options="{'no_create': True, 'no_quick_create': True}"
-                                           widget="many2many_tags"
-                                           attrs="{'invisible': [('cutting_tool_material', '!=', '1')]}"
-                                    />
-                                    <field name="mrs_cutting_tool_cutterbar_model_ids"
-                                           options="{'no_create': True, 'no_quick_create': True}"
-                                           widget="many2many_tags"
-                                           attrs="{'invisible': ['|',('mrs_cutting_tool_cutterpad_model_ids','!=',[]),('cutting_tool_material', '!=', '1')]}"
-                                    />
-                                    <field name="mrs_cutting_tool_cutterpad_model_ids"
-                                           options="{'no_create': True, 'no_quick_create': True}"
-                                           widget="many2many_tags"
-                                           attrs="{'invisible': ['|',('mrs_cutting_tool_cutterbar_model_ids','!=',[]),('cutting_tool_material', '!=', '1')]}"
-                                    />
-                                    <field name="mrs_cutting_tool_cutterhandle_model_ids"
-                                           options="{'no_create': True, 'no_quick_create': True}"
-                                           widget="many2many_tags"/>
-                                    <field name="mrs_cutting_tool_cutterhead_model_ids"
-                                           options="{'no_create': True, 'no_quick_create': True}"
-                                           widget="many2many_tags"/>
+
+                                <field name="mrs_cutting_tool_integral_model_ids"
+                                       options="{'no_create': True, 'no_quick_create': True}"
+                                       widget="many2many_tags"
+                                       attrs="{'invisible': [('mrs_cutting_tool_blade_model_ids', '!=', [])]}"
+                                />
+                                <field name="mrs_cutting_tool_blade_model_ids"
+                                       options="{'no_create': True, 'no_quick_create': True}"
+                                       widget="many2many_tags"
+                                       attrs="{'invisible': [('mrs_cutting_tool_integral_model_ids', '!=', [])]}"
+                                />
+                                <field name="mrs_cutting_tool_cutterbar_model_ids"
+                                       options="{'no_create': True, 'no_quick_create': True}"
+                                       widget="many2many_tags"
+                                       attrs="{'invisible': ['|',('mrs_cutting_tool_cutterpad_model_ids','!=',[]),('mrs_cutting_tool_blade_model_ids', '=', [])]}"
+                                />
+                                <field name="mrs_cutting_tool_cutterpad_model_ids"
+                                       options="{'no_create': True, 'no_quick_create': True}"
+                                       widget="many2many_tags"
+                                       attrs="{'invisible': ['|',('mrs_cutting_tool_cutterbar_model_ids','!=',[]),('mrs_cutting_tool_blade_model_ids', '=', [])]}"
+                                />
+                                <field name="mrs_cutting_tool_cutterhandle_model_ids"
+                                       options="{'no_create': True, 'no_quick_create': True}"
+                                       widget="many2many_tags"/>
+                                <field name="mrs_cutting_tool_cutterhead_model_ids"
+                                       options="{'no_create': True, 'no_quick_create': True}"
+                                       widget="many2many_tags"/>
+<!--                                <field name="functional_cutting_tool_id"/>-->
+<!--                                <field name="cutting_tool_material" required="1" widget="radio"-->
+<!--                                           options="{'horizontal': true}"/>-->
+<!--                                <field name="mrs_cutting_tool_integral_model_ids"-->
+<!--                                       options="{'no_create': True, 'no_quick_create': True}"-->
+<!--                                       widget="many2many_tags"-->
+<!--                                       attrs="{'invisible': [('cutting_tool_material', '!=', '0')]}"-->
+<!--                                />-->
+<!--                                <field name="mrs_cutting_tool_blade_model_ids"-->
+<!--                                       options="{'no_create': True, 'no_quick_create': True}"-->
+<!--                                       widget="many2many_tags"-->
+<!--                                       attrs="{'invisible': [('cutting_tool_material', '!=', '1')]}"-->
+<!--                                />-->
+<!--                                <field name="mrs_cutting_tool_cutterbar_model_ids"-->
+<!--                                       options="{'no_create': True, 'no_quick_create': True}"-->
+<!--                                       widget="many2many_tags"-->
+<!--                                       attrs="{'invisible': ['|',('mrs_cutting_tool_cutterpad_model_ids','!=',[]),('cutting_tool_material', '!=', '1')]}"-->
+<!--                                />-->
+<!--                                <field name="mrs_cutting_tool_cutterpad_model_ids"-->
+<!--                                       options="{'no_create': True, 'no_quick_create': True}"-->
+<!--                                       widget="many2many_tags"-->
+<!--                                       attrs="{'invisible': ['|',('mrs_cutting_tool_cutterbar_model_ids','!=',[]),('cutting_tool_material', '!=', '1')]}"-->
+<!--                                />-->
+<!--                                <field name="mrs_cutting_tool_cutterhandle_model_ids"-->
+<!--                                       options="{'no_create': True, 'no_quick_create': True}"-->
+<!--                                       widget="many2many_tags"/>-->
+<!--                                <field name="mrs_cutting_tool_cutterhead_model_ids"-->
+<!--                                       options="{'no_create': True, 'no_quick_create': True}"-->
+<!--                                       widget="many2many_tags"/>-->
+
                             </group>
                             <group>
                                 <field name="image" nolabel="1" widget="image"/>

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 2/2] =?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