diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py
index 2876bc8f..a464d5cb 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -32,7 +32,7 @@ class MachineTableToolChangingApply(models.Model):
                                  domain=[('product_id.name', '=', '功能刀具')],
                                  related='functional_tool_name_id.barcode_id')
     rfid = fields.Char('Rfid', related='functional_tool_name_id.rfid')
-    functional_tool_name_id = fields.Many2one('sf.functional.tool.assembly', domain=[('assemble_status', '=', '1')],
+    functional_tool_name_id = fields.Many2one('sf.functional.tool.assembly', domain=[('assemble_status', '=', '2')],
                                               string='功能刀具名称')
     functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', store=True,
                                               related='functional_tool_name_id.after_assembly_functional_tool_type_id')
@@ -375,16 +375,17 @@ class FunctionalToolAssembly(models.Model):
     tool_loading_length = fields.Float(string='总长度(mm)', readonly=True)
     functional_tool_length = fields.Float(string='伸出长(mm)', readonly=True)
     effective_length = fields.Float(string='有效长(mm)', readonly=True)
-    loading_task_source = fields.Selection([('0', 'CAM装刀'), ('1', '机台换刀'), ('2', '按库存组装')],
-                                           string='装刀任务来源', readonly=True)
+    loading_task_source = fields.Selection(
+        [('0', 'CAM装刀'), ('1', '机台换刀'), ('2', '按库存组装'), ('3', '寿命到期组装')],
+        string='装刀任务来源', readonly=True)
     use_tool_time = fields.Datetime(string='用刀时间', readonly=True)
     production_line_name_id = fields.Many2one('sf.production.line', string='申请产线', readonly=True)
     machine_tool_name_id = fields.Many2one('maintenance.equipment', string='申请机台', readonly=True)
     machine_tool_code = fields.Char(string='机台号', readonly=True)
     applicant = fields.Char(string='申请人', readonly=True)
     apply_time = fields.Datetime(string='申请时间', default=fields.Datetime.now(), readonly=True)
-    assemble_status = fields.Selection([('0', '待组装'), ('1', '已组装')], string='组装状态', default='0',
-                                       tracking=True, readonly=True)
+    assemble_status = fields.Selection([('0', '待组装'), ('1', '组装中'), ('2', '已组装'), ('3', '已取消')],
+                                       string='组装状态', default='0', tracking=True, readonly=True)
     cutter_spacing_code_id = fields.Many2one('maintenance.equipment.tool', string='刀位号', readonly=True)
     whether_standard_knife = fields.Boolean(string='是否标准刀', default=True, readonly=True)
     reason_for_applying = fields.Char(string='申请原因', readonly=True)
@@ -622,6 +623,8 @@ class FunctionalToolAssembly(models.Model):
             code = 'J' + datetime
         elif loading_task_source == '2':
             code = 'K' + datetime
+        elif loading_task_source == '3':
+            code = 'S' + datetime
         else:
             code = False
         functional_tool_assembly = self.env['sf.functional.tool.assembly'].sudo().search(
diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml
index 390fcb15..480fc357 100644
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -446,19 +446,19 @@
                     <field name="use_tool_time"/>
                     <field name="production_line_name_id" optional="hide"/>
                     <field name="machine_tool_name_id" optional="hide"/>
-                    <field name="applicant"/>
+                    <field name="applicant" optional="hide"/>
                     <field name="apply_time"/>
-                    <field name="assemble_status" optional="hide"/>
+                    <field name="assemble_status"/>
 
-                    <field name="name" invisible="True"/>
-                    <field name="machine_tool_code" invisible="True"/>
-                    <field name="cutter_spacing_code_id" invisible="True"/>
-                    <field name="whether_standard_knife" invisible="True"/>
-                    <field name="reason_for_applying" invisible="True"/>
-                    <field name="functional_tool_type_id" invisible="True"/>
-                    <button string="组装" name="put_start_preset" type="object"
-                            attrs="{'invisible': [('assemble_status', '!=', '0')]}"
-                            class="btn-primary"/>
+<!--                    <field name="name" invisible="True"/>-->
+<!--                    <field name="machine_tool_code" invisible="True"/>-->
+<!--                    <field name="cutter_spacing_code_id" invisible="True"/>-->
+<!--                    <field name="whether_standard_knife" invisible="True"/>-->
+<!--                    <field name="reason_for_applying" invisible="True"/>-->
+<!--                    <field name="functional_tool_type_id" invisible="True"/>-->
+<!--                    <button string="组装" name="put_start_preset" type="object"-->
+<!--                            attrs="{'invisible': [('assemble_status', '!=', '0')]}"-->
+<!--                            class="btn-primary"/>-->
                 </tree>
             </field>
         </record>
@@ -467,14 +467,12 @@
             <field name="name">功能刀具组装</field>
             <field name="model">sf.functional.tool.assembly</field>
             <field name="arch" type="xml">
-                <form create="0" delete="0" edit="0">
+                <form create="0" delete="0" edit="1">
                     <header>
-                        <!--                        <button string="修改编码" name="put_assembly_order_code" type="object"-->
-                        <!--                                class="btn-primary" confirm="是否确认修改编码"/>-->
                         <button string="组装" name="put_start_preset" type="object"
                                 attrs="{'invisible': [('assemble_status', '!=', '0')]}"
                                 class="btn-primary"/>
-                        <field name="assemble_status" widget="statusbar" statusbar_visible="0,1"/>
+                        <field name="assemble_status" widget="statusbar" statusbar_visible="0,1,2"/>
                     </header>
                     <sheet>
                         <div class="oe_button_box" name="button_box">
@@ -488,6 +486,9 @@
                                 </div>
                             </button>
                         </div>
+                        <div class="o_employee_avatar">
+                            <field name="image" widget="image" class="oe_avatar m-0"/>
+                        </div>
                         <div class="oe_title">
                             <h1>
                                 <field name="assembly_order_code"/>
@@ -496,20 +497,19 @@
                         <field name="name" invisible="1"/>
                         <group>
                             <group>
-                                <field name="production_line_name_id"/>
-                                <field name="machine_tool_name_id"/>
-                                <field name="cutter_spacing_code_id"/>
-                                <field name="sf_machine_table_tool_changing_apply_id"
-                                       attrs="{'invisible': [('sf_machine_table_tool_changing_apply_id','=',False)]}"/>
-                                <field name="sf_cam_work_order_program_knife_plan_id"
-                                       attrs="{'invisible': [('sf_cam_work_order_program_knife_plan_id','=',False)]}"/>
+                                <field name="functional_tool_name"/>
+                                <field name="functional_tool_type_id"/>
+                                <field name="tool_groups_id"/>
                             </group>
                             <group>
-                                <field name="image" nolabel="1" widget="image"/>
+                                <field name="functional_tool_diameter" string="刀具直径(mm)"/>
+                                <field name="knife_tip_r_angle"/>
+                                <field name="tool_loading_length" string="总长度(mm)"/>
+                                <field name="functional_tool_length"/>
                             </group>
                         </group>
                         <notebook>
-                            <page string="组装信息" attrs="{'invisible': [('assemble_status', '=', '0')]}">
+                            <page string="组装信息">
                                 <group col="1">
                                     <group col="1">
                                         <group>
@@ -650,28 +650,6 @@
                                     </group>
                                 </group>
                             </page>
-                            <page string="申请信息">
-                                <group>
-                                    <group>
-                                        <field name="functional_tool_name"/>
-                                        <field name="functional_tool_type_id"/>
-                                        <field name="tool_groups_id"/>
-                                        <field name="functional_tool_diameter" string="刀具直径(mm)"/>
-                                        <field name="knife_tip_r_angle"/>
-                                        <field name="tool_loading_length" string="总长度(mm)"/>
-                                        <field name="functional_tool_length"/>
-                                        <field name="effective_length"/>
-                                    </group>
-                                    <group>
-                                        <field name="whether_standard_knife"/>
-                                        <field name="coarse_middle_thin"/>
-                                        <field name="new_former"/>
-                                        <field name="use_tool_time"/>
-                                        <field name="reason_for_applying"/>
-                                        <!--                                        <field name="functional_tool_cutting_type"/>-->
-                                    </group>
-                                </group>
-                            </page>
                             <page string="装刀信息">
                                 <group>
                                     <group>
@@ -685,9 +663,27 @@
                             <page string="其他">
                                 <group>
                                     <group>
+                                        <field name="production_line_name_id"
+                                               attrs="{'invisible': [('production_line_name_id','=',False)]}"/>
+                                        <field name="machine_tool_name_id"
+                                               attrs="{'invisible': [('machine_tool_name_id','=',False)]}"/>
+                                        <field name="cutter_spacing_code_id"
+                                               attrs="{'invisible': [('cutter_spacing_code_id','=',False)]}"/>
+                                        <field name="use_tool_time"/>
+                                        <field name="reason_for_applying"/>
+                                        <field name="sf_machine_table_tool_changing_apply_id"
+                                               attrs="{'invisible': [('sf_machine_table_tool_changing_apply_id','=',False)]}"/>
+                                        <field name="sf_cam_work_order_program_knife_plan_id"
+                                               attrs="{'invisible': [('sf_cam_work_order_program_knife_plan_id','=',False)]}"/>
                                         <field name="check_box_1" invisible="True"/>
                                         <field name="remark"/>
                                     </group>
+                                    <group>
+                                        <field name="effective_length"/>
+                                        <field name="whether_standard_knife"/>
+                                        <field name="coarse_middle_thin" invisible="1"/>
+                                        <field name="new_former" invisible="1"/>
+                                    </group>
                                 </group>
                             </page>
                         </notebook>
@@ -705,20 +701,19 @@
             <field name="arch" type="xml">
                 <search>
                     <field name="functional_tool_name"/>
+                    <field name="tool_groups_id"/>
+                    <field name="functional_tool_diameter"/>
+                    <field name="knife_tip_r_angle"/>
                     <field name="assembly_order_code"/>
                     <field name="code" string="功能刀具编码"/>
                     <field name="barcode_id"/>
-                    <field name="functional_tool_type_id"/>
-                    <field name="tool_groups_id"/>
-                    <field name="loading_task_source" string="任务来源"/>
-                    <field name="production_line_name_id"/>
-                    <field name="machine_tool_name_id"/>
-                    <field name="applicant"/>
+
                     <filter name="no_assemble_status" string="未组装" domain="[('assemble_status', '=', '0')]"/>
-                    <filter name="yes_assemble_status" string="已组装" domain="[('assemble_status', '=', '1')]"/>
+                    <filter name="yes_assemble_status" string="已组装" domain="[('assemble_status', '=', '2')]"/>
                     <separator/>
                     <filter string="已归档" name="inactive" domain="[('active', '=', False)]"/>
                     <searchpanel>
+                        <field name="assemble_status" enable_counters="1" icon="fa-filter"/>
                         <field name="functional_tool_type_id" enable_counters="1" icon="fa-filter"/>
                     </searchpanel>
 
@@ -743,7 +738,7 @@
             <field name="view_mode">tree,form,search</field>
             <!--            <field name="view_id" ref="sf_functional_tool_assembly_tree"/>-->
             <field name="search_view_id" ref="sf_functional_tool_assembly_search"/>
-            <field name="context">{'search_default_no_assemble_status':1}</field>
+            <field name="context">{'search_default_no_assemble_status':2}</field>
         </record>
 
 
diff --git a/sf_tool_management/wizard/wizard.py b/sf_tool_management/wizard/wizard.py
index aa5c645e..d38411bc 100644
--- a/sf_tool_management/wizard/wizard.py
+++ b/sf_tool_management/wizard/wizard.py
@@ -725,7 +725,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
             'after_assembly_effective_length': self.after_assembly_effective_length,
             'L_D_number': self.L_D_number,
             'hiding_length': self.hiding_length,
-            'assemble_status': '1',
+            'assemble_status': '2',
             'tool_loading_person': self.env.user.name,
             'image': self.image,
             'tool_loading_time': fields.Datetime.now()