diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py
index 39c43d8e..bbcf9927 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -283,7 +283,8 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
 
             'loading_task_source': '0',
             'applicant': self.env.user.name,
-            'use_tool_time': self.need_knife_time,
+            'use_tool_time': fields.Datetime.now() + timedelta(
+                hours=4) if not self.need_knife_time else self.need_knife_time,
             'reason_for_applying': '工单用刀',
 
             'sf_cam_work_order_program_knife_plan_id': self.id
diff --git a/sf_tool_management/models/functional_tool.py b/sf_tool_management/models/functional_tool.py
index 628f0b52..a945e965 100644
--- a/sf_tool_management/models/functional_tool.py
+++ b/sf_tool_management/models/functional_tool.py
@@ -14,7 +14,8 @@ class FunctionalCuttingToolEntity(models.Model):
 
     functional_tool_name_id = fields.Many2one('sf.functional.tool.assembly', string='功能刀具组装单', readonly=True)
 
-    tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', related='functional_tool_name_id.tool_groups_id')
+    tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', related='functional_tool_name_id.tool_groups_id',
+                                     store=True)
     code = fields.Char('编码')
     rfid = fields.Char('Rfid', readonly=True)
     rfid_dismantle = fields.Char('Rfid(已拆解)', readonly=True)
@@ -30,7 +31,7 @@ class FunctionalCuttingToolEntity(models.Model):
     coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=True)
     new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧', readonly=True)
     tool_loading_length = fields.Float(string='总长度(mm)', readonly=True, digits=(10, 3))
-    handle_length = fields.Float(string='刀柄长度(mm)',readonly=True, digits=(10, 3))
+    handle_length = fields.Float(string='刀柄长度(mm)', readonly=True, digits=(10, 3))
     functional_tool_length = fields.Float(string='伸出长(mm)', readonly=True, digits=(10, 3))
     effective_length = fields.Float(string='有效长(mm)', readonly=True)
     tool_room_num = fields.Integer(string='刀具房数量', readonly=True)
@@ -47,8 +48,6 @@ class FunctionalCuttingToolEntity(models.Model):
         string='位置', compute='_compute_current_location_id', store=True)
     image = fields.Binary('图片', readonly=True)
 
-    active = fields.Boolean(string='已归档', default=True)
-
     safe_inventory_id = fields.Many2one('sf.real.time.distribution.of.functional.tools',
                                         string='功能刀具安全库存', readonly=True)
 
diff --git a/sf_tool_management/views/functional_tool_views.xml b/sf_tool_management/views/functional_tool_views.xml
index 1dafacf3..c001ba1a 100644
--- a/sf_tool_management/views/functional_tool_views.xml
+++ b/sf_tool_management/views/functional_tool_views.xml
@@ -6,7 +6,7 @@
             <field name="name">sf.functional.cutting.tool.entity.list.tree</field>
             <field name="model">sf.functional.cutting.tool.entity</field>
             <field name="arch" type="xml">
-                <tree string="功能刀具列表" create="0" edit="0" delete="0">
+                <tree string="功能刀具" create="0" edit="0" delete="0">
                     <field name="barcode_id" invisible="1"/>
                     <field name="rfid"/>
                     <field name="tool_name_id"/>
@@ -19,16 +19,16 @@
                     <field name="tool_loading_length" optional="hide"/>
                     <field name="functional_tool_length" optional="hide"/>
                     <field name="effective_length" optional="hide"/>
-                    <field name="tool_room_num"/>
-                    <field name="line_edge_knife_library_num"/>
-                    <field name="machine_knife_library_num"/>
+                    <field name="tool_room_num" optional="hide"/>
+                    <field name="line_edge_knife_library_num" optional="hide"/>
+                    <field name="machine_knife_library_num" optional="hide"/>
                     <field name="max_lifetime_value"/>
                     <field name="alarm_value"/>
                     <field name="used_value"/>
                     <field name="functional_tool_status"/>
+                    <field name="current_location" string="当前位置"/>
 
-                    <field name="current_location_id" optional="hide"/>
-                    <field name="current_location" optional="hide"/>
+                    <field name="current_location_id" invisible="1"/>
                     <field name="sf_cutting_tool_type_id" invisible="True"/>
                 </tree>
             </field>
@@ -46,8 +46,8 @@
                     </header>
                     <sheet>
                         <div class="oe_button_box" name="button_box">
-<!--                            <button name="button_safe_inventory_id" string="更新功能刀具关联的安全库存记录"-->
-<!--                                    type="object" class="btn-primary"/>-->
+                            <!--                            <button name="button_safe_inventory_id" string="更新功能刀具关联的安全库存记录"-->
+                            <!--                                    type="object" class="btn-primary"/>-->
                             <button class="oe_stat_button" groups="sf_base.group_sf_mrp_user"
                                     name="open_functional_tool_warning"
                                     icon="fa-list-ul"
@@ -192,16 +192,30 @@
                     <field name="tool_name_id"/>
                     <field name="functional_tool_diameter"/>
                     <field name="knife_tip_r_angle"/>
+                    <filter string="刀具房" name="tool_room" domain="[('current_location', '=', '刀具房')]"/>
+                    <filter string="线边刀库" name="storage_area" domain="[('current_location', '=', '线边刀库')]"/>
+                    <filter string="机内刀库" name="machine_knife_library"
+                            domain="[('current_location', '=', '机内刀库')]"/>
+                    <separator/>
+                    <filter string="正常" name="normal" domain="[('functional_tool_status', '=', '正常')]"/>
+                    <filter string="报警" name="alarm" domain="[('functional_tool_status', '=', '报警')]"/>
+                    <separator/>
                     <filter string="未拆除" name="no_state_removed"
                             domain="[('functional_tool_status', '!=', '已拆除')]"/>
                     <filter string="已拆除" name="state_removed" domain="[('functional_tool_status', '=', '已拆除')]"/>
-                    <separator/>
-                    <filter string="已归档" name="inactive" domain="[('active', '=', False)]"/>
                     <searchpanel>
-                        <field name="sf_cutting_tool_type_id" icon="fa-building" enable_counters="1"/>
-                        <field name="current_location" icon="fa-building" enable_counters="1"/>
                         <field name="functional_tool_status" icon="fa-building" enable_counters="1"/>
+                        <field name="current_location" icon="fa-building" enable_counters="1"/>
+                        <field name="sf_cutting_tool_type_id" icon="fa-building" enable_counters="1"/>
                     </searchpanel>
+                    <group expand="0">
+                        <filter string="功能刀具名称" name="tool_name" domain="[]"
+                                context="{'group_by': 'tool_name_id'}"/>
+                        <filter string="刀具组" name="tool_groups" domain="[]"
+                                context="{'group_by': 'tool_groups_id'}"/>
+                        <filter string="当前位置" name="current_location" domain="[]"
+                                context="{'group_by': 'current_location'}"/>
+                    </group>
                 </search>
             </field>
         </record>
@@ -297,11 +311,10 @@
                 <tree>
                     <field name="name" invisible="1"/>
                     <field name="functional_name_id"/>
-                    <field name="sf_cutting_tool_type_id" invisible="True"/>
                     <field name="tool_groups_id"/>
                     <field name="diameter"/>
                     <field name="knife_tip_r_angle"/>
-                    <field name="coarse_middle_thin"/>
+                    <field name="coarse_middle_thin" optional="hide"/>
                     <field name="tool_stock_num"/>
                     <field name="side_shelf_num"/>
                     <field name="on_tool_stock_num"/>
@@ -310,6 +323,8 @@
                     <field name="max_stock_num"/>
                     <field name="batch_replenishment_num"/>
                     <field name="unit"/>
+
+                    <field name="sf_cutting_tool_type_id" invisible="True"/>
                 </tree>
             </field>
         </record>
@@ -425,21 +440,20 @@
             <field name="arch" type="xml">
                 <search>
                     <field name="name"/>
-                    <field name="sf_cutting_tool_type_id" invisible="True"/>
+                    <field name="tool_groups_id"/>
+                    <field name="sf_cutting_tool_type_id"/>
                     <field name="diameter"/>
                     <field name="knife_tip_r_angle"/>
-                    <field name="tool_stock_num"/>
-                    <field name="side_shelf_num"/>
-                    <field name="on_tool_stock_num"/>
-                    <field name="tool_stock_total"/>
-                    <field name="min_stock_num"/>
-                    <field name="max_stock_num"/>
-                    <field name="batch_replenishment_num"/>
-                    <field name="unit"/>
+                    <filter string="需补货" name="batch_replenishment" domain="[('batch_replenishment_num', '>', 0)]"/>
+                    <separator/>
                     <filter string="已归档" name="inactive" domain="[('active', '=', False)]"/>
                     <searchpanel>
                         <field name="sf_cutting_tool_type_id" enable_counters="1" icon="fa-building"/>
                     </searchpanel>
+                    <group expand="0">
+                        <filter string="刀具组" name="tool_groups" domain="[]"
+                                context="{'group_by': 'tool_groups_id'}"/>
+                    </group>
                 </search>
             </field>
         </record>
diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml
index 050b4d21..31fe53c9 100644
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -434,17 +434,17 @@
                     <field name="code" optional="hide"/>
                     <field name="functional_tool_name"/>
                     <field name="tool_groups_id"/>
-                    <field name="functional_tool_diameter" string="刀具直径"/>
+                    <field name="functional_tool_diameter" string="刀具直径(mm)"/>
                     <field name="knife_tip_r_angle"/>
                     <field name="coarse_middle_thin" optional="hide"/>
                     <field name="new_former" optional="hide"/>
                     <field name="tool_loading_length" optional="hide"/>
                     <field name="functional_tool_length" optional="hide"/>
-                    <field name="effective_length" optional="hide"/>
+                    <field name="effective_length" invisible="1"/>
                     <field name="loading_task_source" string="任务来源"/>
                     <field name="use_tool_time"/>
-                    <field name="production_line_name_id"/>
-                    <field name="machine_tool_name_id"/>
+                    <field name="production_line_name_id" optional="hide"/>
+                    <field name="machine_tool_name_id" optional="hide"/>
                     <field name="applicant"/>
                     <field name="apply_time"/>
                     <field name="assemble_status" optional="hide"/>
@@ -693,30 +693,29 @@
             <field name="arch" type="xml">
                 <search>
                     <field name="assembly_order_code"/>
-                    <field name="barcode_id" optional="hide"/>
+                    <field name="code" string="功能刀具编码"/>
+                    <field name="barcode_id"/>
                     <field name="functional_tool_name"/>
-                    <field name="functional_tool_diameter"/>
-                    <field name="knife_tip_r_angle"/>
-                    <field name="coarse_middle_thin"/>
-                    <field name="new_former"/>
-                    <field name="tool_loading_length"/>
-                    <field name="functional_tool_length"/>
-                    <field name="effective_length"/>
+                    <field name="functional_tool_type_id"/>
+                    <field name="tool_groups_id"/>
                     <field name="loading_task_source" string="任务来源"/>
-                    <field name="use_tool_time"/>
                     <field name="production_line_name_id"/>
                     <field name="machine_tool_name_id"/>
                     <field name="applicant"/>
-                    <field name="apply_time"/>
-                    <field name="functional_tool_type_id"/>
                     <filter name="no_assemble_status" string="未组装" domain="[('assemble_status', '=', '0')]"/>
                     <filter name="yes_assemble_status" string="已组装" domain="[('assemble_status', '=', '1')]"/>
                     <separator/>
                     <filter string="已归档" name="inactive" domain="[('active', '=', False)]"/>
                     <searchpanel>
                         <field name="functional_tool_type_id" enable_counters="1" icon="fa-filter"/>
-                        <!--                        <field name="assemble_status" enable_counters="1" icon="fa-filter"/>-->
                     </searchpanel>
+
+                    <group expand="0" string="Group By...">
+                        <filter string="功能刀具名称" name="name" domain="[]" context="{'group_by': 'functional_tool_name'}"/>
+                        <filter string="刀具组" name="tool_groups" domain="[]" context="{'group_by': 'tool_groups_id'}"/>
+                        <filter string="任务来源" name="loading_task_source" domain="[]" context="{'group_by': 'loading_task_source'}"/>
+                        <filter string="用刀时间" name="use_tool_time" domain="[]" context="{'group_by': 'use_tool_time'}"/>
+                    </group>
                 </search>
             </field>
         </record>