From 5dba31576a172becb29f05ce19af1dd2f493c269 Mon Sep 17 00:00:00 2001
From: yuxianghui <1608204036@qq.com>
Date: Wed, 28 Jun 2023 10:02:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=88=80=E5=85=B7=E7=AE=A1=E7=90=86=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_tool_management/views/menu_view.xml       |  2 +-
 sf_tool_management/views/tool_base_views.xml | 40 +++++---------------
 sf_tool_management/wizard/wizard_view.xml    |  2 +-
 3 files changed, 12 insertions(+), 32 deletions(-)

diff --git a/sf_tool_management/views/menu_view.xml b/sf_tool_management/views/menu_view.xml
index d3ef12ca..5196e7b0 100644
--- a/sf_tool_management/views/menu_view.xml
+++ b/sf_tool_management/views/menu_view.xml
@@ -30,7 +30,7 @@
                 parent="menu_sf_tool_manage"
                 name="功能刀具预警"
                 sequence="4"
-                action="sf_function_tool_entry_warning_view_act"
+                action="action_sf_functional_cutting_tool_warning"
                 />
 
         <menuitem
diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml
index 3831d303..6ccaedbc 100644
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <odoo>
     <data>
-                <!--         功能刀具列表tree view -->
+<!--========================================功能刀具列表========================================-->
         <record id="view_functional_cutting_tool_list_tree" model="ir.ui.view">
             <field name="name">sf.functional.cutting.tool.entity.list.tree</field>
             <field name="model">sf.functional.cutting.tool.entity</field>
@@ -9,13 +9,8 @@
                 <tree string="功能刀具">
                     <field name="code" />
                     <field name="name" />
-                    <field name="functional_model_number" />
-                    <field name="integral_model_number"/>
-                    <field name="blade_model_number" optional="hide"/>
-                    <field name="cutterbar_model_number" optional="hide"/>
-                    <field name="cutterpad_model_number" optional="hide"/>
-                    <field name="handle_model_number" optional="hide"/>
-                    <field name="chuck_model_number" optional="hide"/>
+                    <field name="mrs_cutting_tool_type_id" />
+                    <field name="mrs_cutting_tool_model_id"/>
                     <field name="diameter" optional="show"/>
                     <field name="tool_grade" optional="show"/>
                     <field name="machining_accuracy" optional="hide"/>
@@ -40,7 +35,7 @@
             <field name="view_id" ref="view_functional_cutting_tool_list_tree"/>
         </record>
 
-        <!--         功能刀具预警tree view -->
+<!--  ======================================== 功能刀具预警========================================-->
         <record id="view_functional_cutting_tool_warning_tree" model="ir.ui.view">
             <field name="name">sf.functional.cutting.tool.entity.tree</field>
             <field name="model">sf.functional.cutting.tool.entity</field>
@@ -48,13 +43,8 @@
                 <tree string="功能刀具">
                     <field name="code" />
                     <field name="name" />
-                    <field name="functional_model_number" />
-                    <field name="integral_model_number"/>
-                    <field name="blade_model_number" optional="hide"/>
-                    <field name="cutterbar_model_number" optional="hide"/>
-                    <field name="cutterpad_model_number" optional="hide"/>
-                    <field name="handle_model_number" optional="hide"/>
-                    <field name="chuck_model_number" optional="hide"/>
+                    <field name="mrs_cutting_tool_type_id" />
+                    <field name="mrs_cutting_tool_model_id"/>
                     <field name="install_tool_time" optional="show"/>
                     <field name="outbound_time" optional="show"/>
                     <field name="machining_accuracy" optional="hide"/>
@@ -85,13 +75,8 @@
 <!--                    <field name="order"/>-->
                     <field name="code"/>
                     <field name="name"/>
-                    <field name="functional_model_number"/>
-                    <field name="integral_model_number"/>
-                    <field name="blade_model_number" optional="hide"/>
-                    <field name="cutterbar_model_number" optional="hide"/>
-                    <field name="cutterpad_model_number" optional="hide"/>
-                    <field name="handle_model_number" optional="hide"/>
-                    <field name="chuck_model_number" optional="hide"/>
+                    <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"/>
@@ -143,13 +128,8 @@
 <!--                    <field name="order"/>-->
                     <field name="code"/>
                     <field name="name"/>
-                    <field name="functional_model_number"/>
-                    <field name="integral_model_number"/>
-                    <field name="blade_model_number" optional="hide"/>
-                    <field name="cutterbar_model_number" optional="hide"/>
-                    <field name="cutterpad_model_number" optional="hide"/>
-                    <field name="handle_model_number" optional="hide"/>
-                    <field name="chuck_model_number" optional="hide"/>
+                    <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"/>
diff --git a/sf_tool_management/wizard/wizard_view.xml b/sf_tool_management/wizard/wizard_view.xml
index 14303edb..d6900757 100644
--- a/sf_tool_management/wizard/wizard_view.xml
+++ b/sf_tool_management/wizard/wizard_view.xml
@@ -81,7 +81,7 @@
                         </group>
                         <group>
                             <group>
-                                <field name="transfer_target" widget="radio"/>
+                                <field name="transfer_target" widget="radio" options="{'horizontal': true}"/>
                             </group>
                         </group>
                         <group>