From 399aaa9e2df4f8ddeaec142ea1887940e1a38178 Mon Sep 17 00:00:00 2001
From: yuxianghui <1608204036@qq.com>
Date: Wed, 19 Jul 2023 17:30:40 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=88=80=E5=85=B7=E5=87=BA=E5=85=A5=E5=BA=93=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E7=9A=84=E5=AD=97=E6=AE=B5=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_tool_management/views/tool_base_views.xml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml
index 4326b0c6..0bd5751c 100644
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -76,16 +76,16 @@
                     <field name="name"/>
                     <field name="mrs_cutting_tool_type_id"/>
                     <field name="mrs_cutting_tool_model_id"/>
-                    <field name="diameter" optional="hide"/>
-                    <field name="tool_grade" optional="hide"/>
-                    <field name="machining_accuracy" optional="hide"/>
-                    <field name="tool_length" optional="hide"/>
-                    <field name="blade_number" optional="hide"/>
-                    <field name="integral_blade_length" optional="hide"/>
-                    <field name="effective_blade_length" optional="hide"/>
-                    <field name="max_life" optional="hide"/>
-                    <field name="is_standard" optional="hide"/>
-                    <field name="applicable_range" optional="hide"/>
+                    <field name="diameter" optional="show"/>
+                    <field name="tool_grade" optional="show"/>
+                    <field name="machining_accuracy" optional="show"/>
+                    <field name="tool_length" optional="show"/>
+                    <field name="blade_number" optional="show"/>
+                    <field name="integral_blade_length" optional="show"/>
+                    <field name="effective_blade_length" optional="show"/>
+                    <field name="max_life" optional="show"/>
+                    <field name="is_standard" optional="show"/>
+                    <field name="applicable_range" optional="show"/>
                     <field name="thickness" optional="show"/>
                     <field name="max_life_span" optional="show"/>
                     <field name="alarm_value" optional="show"/>

From b15d574d8b09ed2805348cae35e04505ac17155e Mon Sep 17 00:00:00 2001
From: yuxianghui <1608204036@qq.com>
Date: Thu, 20 Jul 2023 17:29:03 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E5=88=80?=
 =?UTF-8?q?=E5=85=B7=E7=AE=A1=E7=90=86=E7=9A=84=E5=8A=9F=E8=83=BD=E5=88=80?=
 =?UTF-8?q?=E5=85=B7=E9=A2=84=E8=AD=A6=EF=BC=8C=E5=8A=9F=E8=83=BD=E5=88=80?=
 =?UTF-8?q?=E5=85=B7=E5=88=97=E8=A1=A8=EF=BC=8C=E5=8A=9F=E8=83=BD=E5=88=80?=
 =?UTF-8?q?=E5=85=B7=E5=87=BA=E5=85=A5=E5=BA=93=E8=AE=B0=E5=BD=95=EF=BC=8C?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7=E5=AE=9E=E6=97=B6=E5=88=86?=
 =?UTF-8?q?=E5=B8=83=E7=9A=84=E5=AD=97=E6=AE=B5=EF=BC=8C=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E4=BA=86=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7=E9=A2=84=E8=AD=A6?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=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_tool_management/views/menu_view.xml       | 13 +-----
 sf_tool_management/views/tool_base_views.xml | 45 ++++++++++++++++++++
 2 files changed, 47 insertions(+), 11 deletions(-)

diff --git a/sf_tool_management/views/menu_view.xml b/sf_tool_management/views/menu_view.xml
index 5196e7b0..24c246ea 100644
--- a/sf_tool_management/views/menu_view.xml
+++ b/sf_tool_management/views/menu_view.xml
@@ -2,15 +2,6 @@
 <odoo>
     <data>
 
-        <record id="action_sf_functional_cutting_tool_warning" model="ir.actions.act_window">
-            <field name="name">功能刀具预警</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">sf.functional.cutting.tool.entity</field>
-            <field name="view_mode">tree</field>
-        </record>
-
-
-
         <menuitem id="menu_sf_tool_manage"
                   name="刀具管理"
                   groups="mrp.group_mrp_routings"
@@ -20,7 +11,7 @@
                 id="menu_sf_functional_cutting_tool"
                 parent="menu_sf_tool_manage"
                 name="功能刀具列表"
-                sequence="3"
+                sequence="4"
                 action="sf_function_tool_entry_list_view_act"
                 />
 
@@ -29,7 +20,7 @@
                 id="menu_sf_functional_cutting_tool_warning"
                 parent="menu_sf_tool_manage"
                 name="功能刀具预警"
-                sequence="4"
+                sequence="5"
                 action="action_sf_functional_cutting_tool_warning"
                 />
 
diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml
index 0bd5751c..58ec04ef 100644
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -11,6 +11,12 @@
                     <field name="name" />
                     <field name="mrs_cutting_tool_type_id" />
                     <field name="mrs_cutting_tool_model_id"/>
+                    <field name="mrs_cutting_tool_integral_model_ids" optional="show"/>
+                    <field name="mrs_cutting_tool_blade_model_ids" optional="show"/>
+                    <field name="mrs_cutting_tool_cutterbar_model_ids" optional="show"/>
+                    <field name="mrs_cutting_tool_cutterpad_model_ids" optional="show"/>
+                    <field name="mrs_cutting_tool_cutterhandle_model_ids" optional="show"/>
+                    <field name="mrs_cutting_tool_cutterhead_model_ids" optional="show"/>
                     <field name="diameter" optional="show"/>
                     <field name="tool_grade" optional="show"/>
                     <field name="machining_accuracy" optional="hide"/>
@@ -44,6 +50,23 @@
                     <field name="name" />
                     <field name="mrs_cutting_tool_type_id" />
                     <field name="mrs_cutting_tool_model_id"/>
+                    <field name="mrs_cutting_tool_integral_model_ids" optional="show"/>
+                    <field name="mrs_cutting_tool_blade_model_ids" optional="show"/>
+                    <field name="mrs_cutting_tool_cutterbar_model_ids" optional="show"/>
+                    <field name="mrs_cutting_tool_cutterpad_model_ids" optional="show"/>
+                    <field name="mrs_cutting_tool_cutterhandle_model_ids" optional="show"/>
+                    <field name="mrs_cutting_tool_cutterhead_model_ids" optional="show"/>
+                    <field name="diameter" optional="show"/>
+                    <field name="tool_grade" optional="show"/>
+                    <field name="machining_accuracy" optional="show"/>
+                    <field name="tool_length" optional="show"/>
+                    <field name="blade_number" optional="show"/>
+                    <field name="integral_blade_length" optional="show"/>
+                    <field name="effective_blade_length" optional="show"/>
+                    <field name="max_life" optional="show"/>
+                    <field name="is_standard" optional="show"/>
+                    <field name="applicable_range" optional="show"/>
+
                     <field name="install_tool_time" optional="show"/>
                     <field name="outbound_time" optional="show"/>
                     <field name="machining_accuracy" optional="hide"/>
@@ -64,6 +87,14 @@
             </field>
         </record>
 
+        <record id="action_sf_functional_cutting_tool_warning" model="ir.actions.act_window">
+            <field name="name">功能刀具预警</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sf.functional.cutting.tool.entity</field>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_functional_cutting_tool_warning_tree"/>
+        </record>
+
 <!--  ========================================功能刀具出入库记录==================================================================      -->
 
         <record id="sf_function_tool_entry_exit_records_view_tree" model="ir.ui.view">
@@ -76,6 +107,12 @@
                     <field name="name"/>
                     <field name="mrs_cutting_tool_type_id"/>
                     <field name="mrs_cutting_tool_model_id"/>
+                    <field name="mrs_cutting_tool_integral_model_ids" optional="show"/>
+                    <field name="mrs_cutting_tool_blade_model_ids" optional="show"/>
+                    <field name="mrs_cutting_tool_cutterbar_model_ids" optional="show"/>
+                    <field name="mrs_cutting_tool_cutterpad_model_ids" optional="show"/>
+                    <field name="mrs_cutting_tool_cutterhandle_model_ids" optional="show"/>
+                    <field name="mrs_cutting_tool_cutterhead_model_ids" optional="show"/>
                     <field name="diameter" optional="show"/>
                     <field name="tool_grade" optional="show"/>
                     <field name="machining_accuracy" optional="show"/>
@@ -86,6 +123,7 @@
                     <field name="max_life" optional="show"/>
                     <field name="is_standard" optional="show"/>
                     <field name="applicable_range" optional="show"/>
+
                     <field name="thickness" optional="show"/>
                     <field name="max_life_span" optional="show"/>
                     <field name="alarm_value" optional="show"/>
@@ -127,6 +165,12 @@
 <!--                    <field name="order"/>-->
                     <field name="mrs_cutting_tool_type_id"/>
                     <field name="mrs_cutting_tool_model_id"/>
+                    <field name="mrs_cutting_tool_integral_model_ids" optional="show"/>
+                    <field name="mrs_cutting_tool_blade_model_ids" optional="show"/>
+                    <field name="mrs_cutting_tool_cutterbar_model_ids" optional="show"/>
+                    <field name="mrs_cutting_tool_cutterpad_model_ids" optional="show"/>
+                    <field name="mrs_cutting_tool_cutterhandle_model_ids" optional="show"/>
+                    <field name="mrs_cutting_tool_cutterhead_model_ids" optional="show"/>
                     <field name="diameter" optional="show"/>
                     <field name="tool_grade" optional="show"/>
                     <field name="machining_accuracy" optional="show"/>
@@ -137,6 +181,7 @@
                     <field name="max_life" optional="show"/>
                     <field name="is_standard" optional="show"/>
                     <field name="applicable_range" optional="show"/>
+                    
                     <field name="tool_stock_num" optional="show"/>
                     <field name="side_shelf_num" optional="show"/>
                     <field name="on_tool_stock_num" optional="show"/>