diff --git a/sf_manufacturing/models/model_type.py b/sf_manufacturing/models/model_type.py
index cfa5bea8..48707939 100644
--- a/sf_manufacturing/models/model_type.py
+++ b/sf_manufacturing/models/model_type.py
@@ -1,7 +1,4 @@
-from odoo import fields, models,api
-
-
-
+from odoo import fields, models, api
 
 
 class ModelType(models.Model):
@@ -42,8 +39,6 @@ class ProductModelTypeRoutingSort(models.Model):
     #         if record:
     #             record.routing_type = record.route_workcenter_id.routing_type
 
-
-
     routing_type = fields.Selection(string="工序类型", related='route_workcenter_id.routing_type')
 
     workcenter_ids = fields.Many2many('mrp.workcenter', required=False, related='route_workcenter_id.workcenter_ids')
@@ -77,7 +72,6 @@ class EmbryoModelTypeRoutingSort(models.Model):
     #         if record:
     #             record.routing_type = record.route_workcenter_id.routing_type
 
-
     routing_type = fields.Selection(string="工序类型", related='route_workcenter_id.routing_type')
 
     workcenter_ids = fields.Many2many('mrp.workcenter', required=False, related='route_workcenter_id.workcenter_ids')
@@ -111,7 +105,6 @@ class SurfaceTechnicsModelTypeRoutingSort(models.Model):
     #         if record:
     #             record.routing_type = record.route_workcenter_id.routing_type
 
-
     routing_type = fields.Selection(string="工序类型", related='route_workcenter_id.routing_type')
 
     workcenter_ids = fields.Many2many('mrp.workcenter', required=False, related='route_workcenter_id.workcenter_ids')
diff --git a/sf_manufacturing/models/production_line_base.py b/sf_manufacturing/models/production_line_base.py
index 2cb704f0..f0ee5338 100644
--- a/sf_manufacturing/models/production_line_base.py
+++ b/sf_manufacturing/models/production_line_base.py
@@ -1,4 +1,4 @@
-from odoo import models,fields
+from odoo import models, fields
 
 
 class ProductionLine(models.Model):
@@ -26,8 +26,3 @@ class ProductionLine(models.Model):
     name = fields.Char('生产线', size=20, required=True)
     code = fields.Char('编码', default=_get_code, readonly=True)
     remark = fields.Char('备注')
-
-
-
-
-
diff --git a/sf_plan_management/__init__.py b/sf_plan_management/__init__.py
index 9a7e03ed..0650744f 100644
--- a/sf_plan_management/__init__.py
+++ b/sf_plan_management/__init__.py
@@ -1 +1 @@
-from . import models
\ No newline at end of file
+from . import models
diff --git a/sf_plan_management/models/__init__.py b/sf_plan_management/models/__init__.py
index 9a2c9000..c58a46c7 100644
--- a/sf_plan_management/models/__init__.py
+++ b/sf_plan_management/models/__init__.py
@@ -1,2 +1,2 @@
 from . import calendar_base
-from . import base
\ No newline at end of file
+from . import base
diff --git a/sf_plan_management/models/base.py b/sf_plan_management/models/base.py
index dffc0ef6..d1eff04a 100644
--- a/sf_plan_management/models/base.py
+++ b/sf_plan_management/models/base.py
@@ -44,7 +44,3 @@ class ProcedureEquipmentResourceSetting(models.Model):
                 record.working_shift_id = record.working_calendar_id.working_shift_ids
             else:
                 record.working_shift_id = None
-
-
-
-
diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py
index 14f463a0..7402632f 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -112,6 +112,12 @@ class FunctionalCuttingToolEntity(models.Model):
         result['domain'] = [('functional_tool_name_id', '=', self.functional_tool_name_id.id)]
         return result
 
+    def open_stock_move_line(self):
+        action = self.env.ref('sf_tool_management.sf_inbound_and_outbound_records_of_functional_tools_view_act')
+        result = action.read()[0]
+        result['domain'] = [('lot_id', '=', self.barcode_id.id), ('qty_done', '>', 0)]
+        return result
+
 
 class FunctionalToolWarning(models.Model):
     _name = 'sf.functional.tool.warning'
@@ -150,9 +156,27 @@ class FunctionalToolWarning(models.Model):
         return categories.browse(machine_table_name_ids)
 
 
+class StockMoveLine(models.Model):
+    _inherit = 'stock.move.line'
+    _description = '功能刀具出入库记录'
+
+    functional_tool_name_id = fields.Many2one('sf.functional.tool.assembly', string='功能刀具名称')
+    functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', store=True,
+                                              group_expand='_read_group_functional_tool_type_id',
+                                              related='functional_tool_name_id.functional_tool_type_id')
+    diameter = fields.Integer(string='刀具直径(mm)', related='functional_tool_name_id.functional_tool_diameter')
+    knife_tip_r_angle = fields.Float(string='刀尖R角(mm)', related='functional_tool_name_id.knife_tip_r_angle')
+    install_tool_time = fields.Datetime("刀具组装时间")
+
+    @api.model
+    def _read_group_functional_tool_type_id(self, categories, domain, order):
+        names = categories._search([], order=order, access_rights_uid=SUPERUSER_ID)
+        return categories.browse(names)
+
+
 class RealTimeDistributionOfFunctionalTools(models.Model):
     _name = 'sf.real.time.distribution.of.functional.tools'
-    _description = '功能刀具实时分布'
+    _description = '功能刀具安全库存'
 
     functional_cutting_tool_id = fields.Many2one('sf.functional.cutting.tool.entity', '功能刀具', readonly=True)
     mrs_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True,
@@ -171,12 +195,9 @@ class RealTimeDistributionOfFunctionalTools(models.Model):
             if record:
                 record.mrs_cutting_tool_type_id = record.functional_cutting_tool_id.mrs_cutting_tool_type_id.id
 
-    # code = fields.Char('编码', readonly=True, related='functional_cutting_tool_id.code')
     barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True)
     name = fields.Char('名称', invisible=True, readonly=True)
     functional_tool_name_id = fields.Many2one('product.product', string='功能刀具名称', readonly=True)
-    # mrs_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True,
-    #                                            related='functional_cutting_tool_id.mrs_cutting_tool_type_id')
 
     # 整体式刀具型号
     cutting_tool_integral_model_id = fields.Many2one(
@@ -266,115 +287,6 @@ class RealTimeDistributionOfFunctionalTools(models.Model):
                 self.total = record.tool_stock_total + record.return_total
 
 
-class InboundAndOutboundRecordsOfFunctionalTools(models.Model):
-    _name = 'sf.inbound.and.outbound.records.of.functional.tools'
-    _description = '功能刀具出入库记录'
-
-    functional_cutting_tool_id = fields.Many2one('sf.functional.cutting.tool.entity', '功能刀具', readonly=True)
-    mrs_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True,
-                                               group_expand='_read_mrs_cutting_tool_type_ids',
-                                               store=True,
-                                               compute='_compute_functional_cutting_tool_ids')
-
-    @api.model
-    def _read_mrs_cutting_tool_type_ids(self, categories, domain, order):
-        mrs_cutting_tool_type_ids = categories._search([], order=order, access_rights_uid=SUPERUSER_ID)
-        return categories.browse(mrs_cutting_tool_type_ids)
-
-    @api.depends('functional_cutting_tool_id')
-    def _compute_functional_cutting_tool_ids(self):
-        for record in self:
-            if record:
-                record.mrs_cutting_tool_type_id = record.functional_cutting_tool_id.mrs_cutting_tool_type_id.id
-
-    # code = fields.Char('编码', readonly=True, related='functional_cutting_tool_id.code')
-    barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True)
-    name = fields.Char('名称', invisible=True, readonly=True)
-    functional_tool_name_id = fields.Many2one('product.product', string='功能刀具名称', readonly=True)
-
-    # 整体式刀具型号
-    cutting_tool_integral_model_id = fields.Many2one('product.product', string='整体式刀具型号', readonly=True,
-                                                     domain=[('cutting_tool_material_id', '=', '整体式刀具')])
-
-    # 刀片型号
-    cutting_tool_blade_model_id = fields.Many2one('product.product', string='刀片型号', readonly=True,
-                                                  domain=[('cutting_tool_material_id', '=', '刀片')])
-
-    # 刀杆型号
-    cutting_tool_cutterbar_model_id = fields.Many2one('product.product', string='刀杆型号', readonly=True,
-                                                      domain=[('cutting_tool_material_id', '=', '刀杆')])
-
-    # 刀盘型号
-    cutting_tool_cutterpad_model_id = fields.Many2one('product.product', string='刀盘型号', readonly=True,
-                                                      domain=[('cutting_tool_material_id', '=', '刀盘')])
-
-    # 刀柄型号
-    cutting_tool_cutterhandle_model_id = fields.Many2one('product.product', string='刀柄型号', readonly=True,
-                                                         domain=[('cutting_tool_material_id', '=', '刀柄')])
-
-    # 夹头型号
-    cutting_tool_cutterhead_model_id = fields.Many2one('product.product', string='夹头型号', readonly=True,
-                                                       domain=[('cutting_tool_material_id', '=', '夹头')])
-
-    diameter = fields.Float('直径(mm)', readonly=True)
-    tool_grade = fields.Selection([('1', 'P1'), ('2', 'P2'), ('3', 'P3'), ('4', 'P4'), ('5', 'P5'), ('6', 'P6')],
-                                  string='刀具等级', readonly=True, compute='_compute_functional_cutting_tool_id')
-    machining_accuracy = fields.Float('加工精度(mm)', readonly=True)
-    tool_length = fields.Float('装刀长(mm)', readonly=True)
-    blade_number = fields.Integer('刃数', readonly=True)
-    integral_blade_length = fields.Float('整体刃长(mm)', readonly=True)
-    effective_blade_length = fields.Float('有效刃长(mm)', readonly=True)
-    max_life = fields.Float('最大寿命值', readonly=True)
-    is_standard = fields.Selection([('1', '是'), ('0', '否')], '是否标准刀', readonly=True,
-                                   compute='_compute_functional_cutting_tool_id')
-    applicable_range = fields.Char('适用范围', readonly=True)
-    image = fields.Binary('图片', readonly=True)
-
-    @api.depends('functional_cutting_tool_id')
-    def _compute_functional_cutting_tool_id(self):
-        if self.functional_cutting_tool_id:
-            self.tool_grade = self.functional_cutting_tool_id.tool_grade
-            self.is_standard = self.functional_cutting_tool_id.is_standard
-
-    # 功能刀具出入库记录 特有字段
-    current_state = fields.Char(string='当前状态', readonly=False)
-    current_store_area = fields.Char(string='当前库区', readonly=False)
-    current_store_place = fields.Char(string='当前库位', readonly=False)
-    tool_install_staff = fields.Char(string='装刀人', readonly=False)
-    tool_install_time = fields.Datetime(string='装刀时间', readonly=False)
-    thickness = fields.Selection([('1', '粗'), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=False)
-    # max_life_span = fields.Char(string='最大寿命值', readonly=False)
-    alarm_value = fields.Char(string='报警值', readonly=False)
-    used_value = fields.Char(string='已使用值', readonly=False)
-    reason_application = fields.Char(string='申请原因', readonly=False)
-    applicant = fields.Char(string='申请人', readonly=False)
-
-    inbound_and_outbound_records_ids = fields.One2many('sf.inbound.and.outbound.records',
-                                                       'inbound_and_outbound_tools_id', string='出入库记录')
-
-    remark = fields.Char(string='备注/说明', readonly=False)
-
-
-class InboundAndOutboundRecords(models.Model):
-    _name = 'sf.inbound.and.outbound.records'
-    _description = '出入库记录'
-    _order = 'id DESC'
-
-    inbound_and_outbound_tools_id = fields.Many2one('sf.inbound.and.outbound.records.of.functional.tools',
-                                                    string='功能刀具出入库记录')
-
-    name = fields.Char(string='出入库记录')
-    tool_state = fields.Selection([('0', '领用出库'), ('1', '归还入库')], string="出入库类别", readonly=False)
-    receive_equipment = fields.Char(string='领用机台', readonly=False)
-    receive_staff = fields.Char(string='领用人', readonly=False)
-    receive_time = fields.Datetime(string='领用出库时间', readonly=False)
-    return_staff = fields.Char(string='归还人', readonly=False)
-    return_time = fields.Datetime(string='归还入库时间', readonly=False)
-    current_store_area = fields.Char(string='库区', readonly=False)
-    current_store_place = fields.Char(string='库位', readonly=False)
-    number = fields.Integer(string='数量', readonly=False)
-
-
 class MachineTableToolChangingApply(models.Model):
     _name = 'sf.machine.table.tool.changing.apply'
     _description = '机床换刀申请'
@@ -390,12 +302,14 @@ class MachineTableToolChangingApply(models.Model):
     machine_tool_code = fields.Char(string='机台号', store=True, invisible=True, readonly=True)
     cutter_spacing_code_id = fields.Many2one('maintenance.equipment.tool', string='刀位号', readonly=False,
                                              required=True, domain="[('equipment_id', '=', maintenance_equipment_id)]")
-    barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号',
-                                 domain=[('product_id.name', '=', '功能刀具')])
-    functional_tool_name = fields.Char(string='功能刀具名称')
-    functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型')
-    functional_tool_name_id = fields.Many2one('product.product', string='功能刀具',
-                                              domain=[('name', '=', '功能刀具')])
+    functional_tool_name = fields.Char(string='刀具名称', related='functional_tool_name_id.name', store=True)
+    barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', store=True,
+                                 domain=[('product_id.name', '=', '功能刀具')],
+                                 related='functional_tool_name_id.barcode_id')
+    functional_tool_name_id = fields.Many2one('sf.functional.tool.assembly', string='功能刀具名称')
+    functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', store=True,
+                                              related='functional_tool_name_id.functional_tool_type_id')
+
     tool_position_interface_type = fields.Selection(
         [('BT刀柄式', 'BT刀柄式'), ('SK刀柄式', 'SK刀柄式'), ('HSK刀柄式', 'HSK刀柄式'),
          ('CAT刀柄式', 'CAT刀柄式'), ('ISO刀盘式', 'ISO刀盘式'), ('DIN刀盘式', 'DIN刀盘式'),
@@ -463,7 +377,7 @@ class MachineTableToolChangingApply(models.Model):
         :return:
         """
         # 更新数据到机台换刀申请界面
-        if self.functional_tool_status == '报警' and self.sf_functional_tool_assembly_id == False:
+        if self.functional_tool_status == '报警' and not self.sf_functional_tool_assembly_id:
             machine_table_tool_changing_apply = self.env['sf.machine.table.tool.changing.apply'].search(
                 [('maintenance_equipment_id', '=', self.maintenance_equipment_id.id),
                  ('cutter_spacing_code_id', '=', self.cutter_spacing_code_id.id)
@@ -601,9 +515,9 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
 
         # 将计划执行状态改为执行中
         self.env['sf.cam.work.order.program.knife.plan'].search(
-            [('barcode_id', '=', self.barcode_id.id)]).write({
-            'plan_execute_status': '1',
-            'applicant': self.env.user.name})
+            [('barcode_id', '=', self.barcode_id.id)]).write(
+            {'plan_execute_status': '1',
+             'applicant': self.env.user.name})
 
     def revocation(self):
         """
@@ -616,11 +530,10 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
 
         # 将计划执行状态改为待执行，同时清除申请人、功能刀具组装字段数据
         self.env['sf.cam.work.order.program.knife.plan'].search(
-            [('barcode_id', '=', self.barcode_id.id)]).write({
-            'plan_execute_status': '0',
-            'applicant': None,
-            'sf_functional_tool_assembly_id': None,
-        })
+            [('barcode_id', '=', self.barcode_id.id)]).write(
+            {'plan_execute_status': '0',
+             'applicant': None,
+             'sf_functional_tool_assembly_id': None})
 
 
 class FunctionalToolAssembly(models.Model):
diff --git a/sf_tool_management/security/ir.model.access.csv b/sf_tool_management/security/ir.model.access.csv
index fa10d0c5..cc72f699 100644
--- a/sf_tool_management/security/ir.model.access.csv
+++ b/sf_tool_management/security/ir.model.access.csv
@@ -2,8 +2,6 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_sf_functional_cutting_tool_entity,sf.functional.cutting.tool.entity,model_sf_functional_cutting_tool_entity,base.group_user,1,1,1,1
 access_sf_functional_tool_warning,sf.functional.tool.warning,model_sf_functional_tool_warning,base.group_user,1,1,1,1
 access_sf_real_time_distribution_of_functional_tools,sf.real.time.distribution.of.functional.tools,model_sf_real_time_distribution_of_functional_tools,base.group_user,1,1,1,1
-access_sf_inbound_and_outbound_records_of_functional_tools,sf.inbound.and.outbound.records.of.functional.tools,model_sf_inbound_and_outbound_records_of_functional_tools,base.group_user,1,1,1,1
-access_sf_inbound_and_outbound_records,sf.inbound.and.outbound.records,model_sf_inbound_and_outbound_records,base.group_user,1,1,1,1
 
 access_sf_cam_work_order_program_knife_plan,sf.cam.work.order.program.knife.plan,model_sf_cam_work_order_program_knife_plan,base.group_user,1,1,1,1
 access_sf_machine_table_tool_changing_apply,sf.machine.table.tool.changing.apply,model_sf_machine_table_tool_changing_apply,base.group_user,1,1,1,1
diff --git a/sf_tool_management/views/menu_view.xml b/sf_tool_management/views/menu_view.xml
index efa4feee..c1fc939b 100644
--- a/sf_tool_management/views/menu_view.xml
+++ b/sf_tool_management/views/menu_view.xml
@@ -25,15 +25,15 @@
         />
 
         <menuitem
-                sequence="6"
-                name="功能刀具实时分布"
+                sequence="10"
+                name="功能刀具安全库存"
                 id="menu_sf_functional_tool_real_time_distribution"
                 action="sf_real_time_distribution_of_functional_tools_view_act"
                 parent="menu_sf_tool_manage"
         />
 
         <menuitem
-                sequence="10"
+                sequence="6"
                 name="功能刀具出入库记录"
                 id="menu_sf_function_tool_entry_exit_records"
                 action="sf_inbound_and_outbound_records_of_functional_tools_view_act"
diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml
index 1cac4820..674c9faf 100644
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -51,8 +51,16 @@
                                     </span>
                                 </div>
                             </button>
-                            <button name="%(stock.action_stock_report)d" icon="fa-arrow-up" class="oe_stat_button"
-                                    string="Traceability" type="action"/>
+                            <button class="oe_stat_button"
+                                    name="open_stock_move_line"
+                                    icon="fa-list-ul"
+                                    type="object">
+                                <div class="o_field_widget o_stat_info">
+                                    <span>
+                                        出库入库记录
+                                    </span>
+                                </div>
+                            </button>
                         </div>
                         <div class="oe_title">
                             <h1>
@@ -416,136 +424,43 @@
 
         <record id="sf_inbound_and_outbound_records_of_functional_tools_view_tree" model="ir.ui.view">
             <field name="name">功能刀具出入库记录</field>
-            <field name="model">sf.inbound.and.outbound.records.of.functional.tools</field>
+            <field name="model">stock.move.line</field>
             <field name="arch" type="xml">
                 <tree string="功能刀具出入库记录" create="0" edit="0" delete="0">
-                    <field name="barcode_id"/>
-                    <field name="functional_tool_name_id"/>
-                    <field name="mrs_cutting_tool_type_id"/>
-                    <field name="cutting_tool_integral_model_id" optional="hide"/>
-                    <field name="cutting_tool_blade_model_id" optional="hide"/>
-                    <field name="cutting_tool_cutterbar_model_id" optional="hide"/>
-                    <field name="cutting_tool_cutterpad_model_id" optional="hide"/>
-                    <field name="cutting_tool_cutterhandle_model_id" optional="hide"/>
-                    <field name="cutting_tool_cutterhead_model_id" optional="hide"/>
-                    <field name="current_state"/>
-                    <field name="current_store_area"/>
-                    <field name="current_store_place"/>
-                    <!--                    <field name="applicant"/>-->
+                    <field name="reference" string="单据号"/>
+                    <field name="lot_id" string="功能刀具序列号"/>
+                    <field name="functional_tool_name_id" string="功能刀具名称"/>
+                    <field name="diameter"/>
+                    <field name="knife_tip_r_angle"/>
+                    <field name="install_tool_time"/>
+                    <field name="location_id"/>
+                    <field name="location_dest_id"/>
+                    <field name="date"/>
+                    <field name="qty_done" string="数量"/>
+                    <field name="functional_tool_type_id" invisible="True"/>
                 </tree>
             </field>
         </record>
 
-        <record id="sf_inbound_and_outbound_records_of_functional_tools_view_form" model="ir.ui.view">
-            <field name="name">功能刀具出入库记录</field>
-            <field name="model">sf.inbound.and.outbound.records.of.functional.tools</field>
-            <field name="arch" type="xml">
-                <form string="功能刀具出入库记录" create="0" edit="0" delete="0">
-                    <sheet>
-                        <div class="oe_title">
-                            <h1>
-                                <field name="barcode_id" readonly="1"/>
-                            </h1>
-                        </div>
-                        <group>
-                            <group>
-                                <field name="functional_tool_name_id" invisible="False"/>
-                                <field name="mrs_cutting_tool_type_id"/>
-
-                                <field name="cutting_tool_integral_model_id"
-                                       options="{'no_create': True, 'no_quick_create': True}"
-                                       attrs="{'invisible': [('cutting_tool_blade_model_id', '!=', False)]}"
-                                />
-                                <field name="cutting_tool_blade_model_id"
-                                       options="{'no_create': True, 'no_quick_create': True}"
-                                       attrs="{'invisible': [('cutting_tool_integral_model_id', '!=', False)]}"
-                                />
-                                <field name="cutting_tool_cutterbar_model_id"
-                                       options="{'no_create': True, 'no_quick_create': True}"
-                                       attrs="{'invisible': ['|',('cutting_tool_cutterpad_model_id','!=',False),('cutting_tool_blade_model_id', '=', False)]}"
-                                />
-                                <field name="cutting_tool_cutterpad_model_id"
-                                       options="{'no_create': True, 'no_quick_create': True}"
-                                       attrs="{'invisible': ['|',('cutting_tool_cutterbar_model_id','!=',False),('cutting_tool_blade_model_id', '=', False)]}"
-                                />
-                                <field name="cutting_tool_cutterhandle_model_id"
-                                       options="{'no_create': True, 'no_quick_create': True}"/>
-                                <field name="cutting_tool_cutterhead_model_id"
-                                       options="{'no_create': True, 'no_quick_create': True}"/>
-
-                            </group>
-                            <group>
-                                <field name="image" nolabel="1" widget="image"/>
-                            </group>
-                        </group>
-                        <notebook>
-                            <page string="出入库信息">
-                                <field name="inbound_and_outbound_records_ids"/>
-                            </page>
-                            <page string="参数信息">
-                                <group>
-                                    <group>
-                                        <field name="diameter"/>
-                                        <field name="tool_grade"/>
-                                        <field name="machining_accuracy"/>
-                                        <field name="tool_length"/>
-                                        <field name="blade_number"/>
-                                    </group>
-                                    <group>
-                                        <field name="integral_blade_length"/>
-                                        <field name="effective_blade_length"/>
-                                        <field name="max_life"/>
-                                        <field name="is_standard" default="false"/>
-                                        <field name="applicable_range"/>
-                                    </group>
-                                </group>
-                            </page>
-                            <page string="其他信息">
-                                <group>
-                                    <group>
-                                        <field name="current_store_area"/>
-                                        <field name="current_store_place"/>
-                                        <field name="alarm_value"/>
-                                        <field name="tool_install_staff"/>
-                                        <field name="applicant"/>
-                                        <field name="remark"/>
-                                    </group>
-                                    <group>
-                                        <field name="current_state"/>
-                                        <field name="thickness"/>
-                                        <!--                                        <field name="max_life_span"/>-->
-                                        <field name="used_value"/>
-                                        <field name="tool_install_time"/>
-                                        <field name="reason_application"/>
-                                    </group>
-                                </group>
-                            </page>
-                        </notebook>
-                    </sheet>
-                </form>
-            </field>
-        </record>
 
         <record id="sf_inbound_and_outbound_records_of_functional_tools_view_search" model="ir.ui.view">
             <field name="name">功能刀具出入库记录</field>
-            <field name="model">sf.inbound.and.outbound.records.of.functional.tools</field>
+            <field name="model">stock.move.line</field>
             <field name="arch" type="xml">
                 <search>
-                    <field name="barcode_id"/>
+                    <field name="reference"/>
+                    <field name="lot_id"/>
                     <field name="functional_tool_name_id"/>
-                    <field name="mrs_cutting_tool_type_id"/>
-                    <field name="cutting_tool_integral_model_id" optional="hide"/>
-                    <field name="cutting_tool_blade_model_id" optional="hide"/>
-                    <field name="cutting_tool_cutterbar_model_id" optional="hide"/>
-                    <field name="cutting_tool_cutterpad_model_id" optional="hide"/>
-                    <field name="cutting_tool_cutterhandle_model_id" optional="hide"/>
-                    <field name="cutting_tool_cutterhead_model_id" optional="hide"/>
-                    <field name="current_state"/>
-                    <field name="current_store_area"/>
-                    <field name="current_store_place"/>
-                    <!--                    <field name="applicant"/>-->
+                    <field name="diameter"/>
+                    <field name="knife_tip_r_angle"/>
+                    <field name="install_tool_time"/>
+                    <field name="location_id"/>
+                    <field name="location_dest_id"/>
+                    <field name="date"/>
+                    <field name="qty_done"/>
+                    <field name="functional_tool_type_id" invisible="True"/>
                     <searchpanel>
-                        <field name="mrs_cutting_tool_type_id" enable_counters="1" icon="fa-building"/>
+                        <field name="functional_tool_type_id" enable_counters="1" icon="fa-building"/>
                     </searchpanel>
                 </search>
             </field>
@@ -554,62 +469,13 @@
         <record id="sf_inbound_and_outbound_records_of_functional_tools_view_act" model="ir.actions.act_window">
             <field name="name">功能刀具出入库记录</field>
             <field name="type">ir.actions.act_window</field>
-            <field name="res_model">sf.inbound.and.outbound.records.of.functional.tools</field>
-            <field name="view_mode">tree,form,search</field>
-        </record>
-
-
-        <!--================================================出入库记录================================================-->
-        <record id="sf_inbound_and_outbound_records_view_tree" model="ir.ui.view">
-            <field name="name">出入库记录</field>
-            <field name="model">sf.inbound.and.outbound.records</field>
-            <field name="arch" type="xml">
-                <tree>
-                    <field name="tool_state"/>
-                    <field name="receive_equipment"/>
-                    <field name="receive_staff"/>
-                    <field name="receive_time"/>
-                    <field name="return_staff"/>
-                    <field name="return_time"/>
-                    <field name="current_store_area"/>
-                    <field name="current_store_place"/>
-                    <field name="number"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="sf_inbound_and_outbound_records_view_form" model="ir.ui.view">
-            <field name="name">出入库记录</field>
-            <field name="model">sf.inbound.and.outbound.records</field>
-            <field name="arch" type="xml">
-                <form>
-                    <sheet>
-                        <group>
-                            <group>
-                                <field name="tool_state"/>
-                                <field name="receive_equipment"/>
-                                <field name="receive_staff"/>
-                                <field name="receive_time"/>
-                                <field name="current_store_area"/>
-                            </group>
-                            <group>
-                                <field name="number"/>
-                                <field name="return_staff"/>
-                                <field name="return_time"/>
-                                <field name="inbound_and_outbound_tools_id" readonly="True"/>
-                                <field name="current_store_place"/>
-                            </group>
-                        </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-
-        <record id="sf_inbound_and_outbound_records_view_act" model="ir.actions.act_window">
-            <field name="name">出入库记录</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">sf.inbound.and.outbound.records</field>
-            <field name="view_mode">tree,form</field>
+            <field name="res_model">stock.move.line</field>
+            <field name="view_mode">tree,search</field>
+            <field name="view_id"
+                   ref="sf_tool_management.sf_inbound_and_outbound_records_of_functional_tools_view_tree"/>
+            <field name="search_view_id"
+                   ref="sf_tool_management.sf_inbound_and_outbound_records_of_functional_tools_view_search"/>
+            <field name="domain">[('functional_tool_name_id', '!=', False)]</field>
         </record>
 
 
@@ -624,7 +490,7 @@
                     <field name="maintenance_equipment_id"/>
                     <field name="machine_tool_code"/>
                     <field name="cutter_spacing_code_id"/>
-                    <field name="functional_tool_name"/>
+                    <field name="functional_tool_name_id"/>
                     <field name="diameter"/>
                     <field name="knife_tip_r_angle"/>
                     <field name="max_lifetime_value"/>
@@ -639,9 +505,8 @@
                     <field name="tool_position_interface_type" invisible="1"/>
                     <field name="extension_length" invisible="1"/>
                     <field name="effective_length" invisible="1"/>
-                    <field name="functional_tool_name_id" invisible="1"/>
-                    <field name="whether_standard_knife" invisible="1"/>
                     <field name="functional_tool_name" invisible="1"/>
+                    <field name="whether_standard_knife" invisible="1"/>
                     <field name="status" invisible="1"/>
                     <button string="换刀申请"
                             name="%(sf_tool_management.sf_tool_change_requirement_information_act)d"
@@ -654,7 +519,6 @@
                                         'default_cutter_spacing_code_id': cutter_spacing_code_id,
                                         'default_barcode_id': barcode_id,
                                         'default_functional_tool_name': functional_tool_name,
-                                        'default_functional_tool_name_id': functional_tool_name_id,
                                         'default_functional_tool_type_id': functional_tool_type_id,
                                         'default_tool_position_interface_type': tool_position_interface_type,
                                         'default_diameter': diameter,
@@ -690,7 +554,6 @@
                                         'default_cutter_spacing_code_id': cutter_spacing_code_id,
                                         'default_barcode_id': barcode_id,
                                         'default_functional_tool_name': functional_tool_name,
-                                        'default_functional_tool_name_id': functional_tool_name_id,
                                         'default_functional_tool_type_id': functional_tool_type_id,
                                         'default_tool_position_interface_type': tool_position_interface_type,
                                         'default_diameter': diameter,
@@ -730,7 +593,6 @@
                                         'default_cutter_spacing_code_id': cutter_spacing_code_id,
                                         'default_barcode_id': barcode_id,
                                         'default_functional_tool_name': functional_tool_name,
-                                        'default_functional_tool_name_id': functional_tool_name_id,
                                         'default_functional_tool_type_id': functional_tool_type_id,
                                         'default_tool_position_interface_type': tool_position_interface_type,
                                         'default_diameter': diameter,
@@ -766,7 +628,6 @@
                                         'default_cutter_spacing_code_id': cutter_spacing_code_id,
                                         'default_barcode_id': barcode_id,
                                         'default_functional_tool_name': functional_tool_name,
-                                        'default_functional_tool_name_id': functional_tool_name_id,
                                         'default_functional_tool_type_id': functional_tool_type_id,
                                         'default_tool_position_interface_type': tool_position_interface_type,
                                         'default_diameter': diameter,
@@ -803,7 +664,7 @@
                         </group>
                         <field name="name" invisible="True"/>
                         <field name="machine_tool_code" invisible="True"/>
-                        <field name="functional_tool_name_id" invisible="True"/>
+                        <field name="functional_tool_name" invisible="True"/>
                         <field name="whether_standard_knife" invisible="True"/>
                         <field name="status" invisible="True"/>
                         <notebook>
@@ -811,7 +672,7 @@
                                 <group>
                                     <group>
                                         <field name="barcode_id"/>
-                                        <field name="functional_tool_name"/>
+                                        <field name="functional_tool_name_id"/>
                                         <field name="functional_tool_type_id"/>
                                         <field name="diameter"/>
                                         <field name="knife_tip_r_angle"/>
@@ -843,7 +704,7 @@
                     <field name="machine_table_type_id"/>
                     <field name="cutter_spacing_code_id" optional="hide"/>
                     <field name="barcode_id" invisible="1"/>
-                    <field name="functional_tool_name"/>
+                    <field name="functional_tool_name_id"/>
                     <field name="diameter"/>
                     <field name="knife_tip_r_angle"/>
                     <field name="max_lifetime_value"/>
diff --git a/sf_tool_management/wizard/wizard.py b/sf_tool_management/wizard/wizard.py
index 990addf1..d667ba33 100644
--- a/sf_tool_management/wizard/wizard.py
+++ b/sf_tool_management/wizard/wizard.py
@@ -339,33 +339,28 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
         功能刀具组装
         :return:
         """
-        # 对物料做必填判断
-        self.materials_must_be_judged()
-
-        # 创建组装入库单
-        # 创建功能刀具批次/序列号记录
-        stock_lot = self.create_assemble_warehouse_receipt()
-        # 创建刀具组装入库单
-        self.create_stocking_picking(stock_lot)
-        # 封装功能刀具数据
-        desc_1 = self.get_desc_1(stock_lot)
         functional_tool_assembly = self.env['sf.functional.tool.assembly'].search([
             ('assembly_order_code', '=', self.assembly_order_code),
             ('machine_tool_name_id', '=', self.machine_tool_name_id.id),
             ('cutter_spacing_code_id', '=', self.cutter_spacing_code_id.id),
             ('assemble_status', '=', '0'),
         ])
+        # 对物料做必填判断
+        self.materials_must_be_judged()
+
+        # 创建组装入库单
+        # 创建功能刀具批次/序列号记录
+        stock_lot = self.create_assemble_warehouse_receipt(functional_tool_assembly)
+        # 创建刀具组装入库单
+        self.create_stocking_picking(stock_lot)
+        # 封装功能刀具数据
+        desc_1 = self.get_desc_1(stock_lot)
 
         # 创建功能刀具列表记录
         # 封装功能刀具数据
         desc_2 = self.get_desc_2(stock_lot, functional_tool_assembly)
         # 创建功能刀具列表、功能刀具预警、功能刀具实时分布、功能刀具出入库记录
         record_1 = self.env['sf.functional.cutting.tool.entity'].create(desc_2)
-        # self.env['sf.functional.tool.warning'].create({
-        #     'functional_cutting_tool_id': record_1.id,
-        #     'functional_tool_assembly_id': functional_tool_assembly.id,
-        #     'machine_table_name_id': self.machine_tool_name_id.id,
-        # })
         # self.env['sf.real.time.distribution.of.functional.tools'].create({
         #     'functional_cutting_tool_id': record_1.id
         # })
@@ -419,7 +414,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
         #  将刀具组装入库单的状态更改为就绪
         picking_id.action_confirm()
 
-    def create_assemble_warehouse_receipt(self):
+    def create_assemble_warehouse_receipt(self, functional_tool_assembly):
         """
             创建功能刀具批次/序列号记录
         """
@@ -431,11 +426,11 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
             'company_id': self.env.company.id
         })
         # 创建功能刀具该批次/序列号  库存移动和移动历史
-        self.create_stock_quant(product_id, stock_lot)
+        self.create_stock_quant(product_id, stock_lot, functional_tool_assembly)
 
         return stock_lot
 
-    def create_stock_quant(self, product_id, stock_lot):
+    def create_stock_quant(self, product_id, stock_lot, functional_tool_assembly):
         """
             创建功能刀具该批次/序列号 库存移动和移动历史
         """
@@ -445,7 +440,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
 
         # 创建库存移动
         stock_move_id = self.env['stock.move'].create({
-            'name': '更新的产品数量',
+            'name': '功能刀具组装出库',
             'product_id': product_id.id,
             'location_id': location_inventory_id.id,
             'location_dest_id': stock_location_id.id,
@@ -456,8 +451,10 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
         # 创建移动历史
         stock_move_line_id = self.env['stock.move.line'].create({
             'product_id': product_id.id,
+            'functional_tool_name_id': functional_tool_assembly.id,
             'lot_id': stock_lot.id,
             'move_id': stock_move_id.id,
+            'install_tool_time': fields.Datetime.now(),
             'qty_done': 1.0,
             'state': 'done'
         })