diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py
index 675542f1..0e25de4f 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -652,11 +652,33 @@ class FunctionalToolAssembly(models.Model):
             # 获取功能刀具缓存信息
             record = self.env['sf.functional.cutting.tool.entity.cache'].search([
                 ('code', '=', self.functional_tool_code)])
-            # 删除缓存信息
-            record.unlink()
             # 修改功能刀具列表信息
             self.env['sf.functional.cutting.tool.entity'].search([
-                ('code', '=', self.functional_tool_code)]).write(record)
+                ('code', '=', self.functional_tool_code)]).write({
+                'code': record.code,
+                'name': record.name,
+                'mrs_cutting_tool_type_id': record.mrs_cutting_tool_type_id.id,
+                'mrs_cutting_tool_model_id': record.mrs_cutting_tool_model_id.id,
+                'mrs_cutting_tool_integral_model_ids': record.mrs_cutting_tool_integral_model_ids.ids,
+                'mrs_cutting_tool_blade_model_ids': record.mrs_cutting_tool_blade_model_ids.ids,
+                'mrs_cutting_tool_cutterbar_model_ids': record.mrs_cutting_tool_cutterbar_model_ids.ids,
+                'mrs_cutting_tool_cutterpad_model_ids': record.mrs_cutting_tool_cutterpad_model_ids.ids,
+                'mrs_cutting_tool_cutterhandle_model_ids': record.mrs_cutting_tool_cutterhandle_model_ids.ids,
+                'mrs_cutting_tool_cutterhead_model_ids': record.mrs_cutting_tool_cutterhead_model_ids.ids,
+                'diameter': record.diameter,
+                'tool_grade': record.tool_grade,
+                'machining_accuracy': record.machining_accuracy,
+                'tool_length': record.tool_length,
+                'blade_number': record.blade_number,
+                'integral_blade_length': record.integral_blade_length,
+                'effective_blade_length': record.effective_blade_length,
+                'max_life': record.max_life,
+                'is_standard': record.is_standard,
+                'applicable_range': record.applicable_range,
+                'image': record.image,
+            })
+            # 删除缓存信息
+            record.unlink()
 
         # # 删除功能刀具预警、实时分布、出入库记录的新记录
         # self.env['sf.functional.tool.warning'].search([
@@ -714,8 +736,6 @@ class FunctionalToolAssembly(models.Model):
         """
         self.env['sf.delivery.of.cargo.from.storage'].search([]).unlink()
 
-
-
         vals = self.env['sf.functional.tool.assembly'].search([('check_box_1', '=', True),('assemble_status', '=', '1')])
         if vals:
             for val in vals:
diff --git a/sf_tool_management/wizard/wizard.py b/sf_tool_management/wizard/wizard.py
index 8973a8b8..2699cf89 100644
--- a/sf_tool_management/wizard/wizard.py
+++ b/sf_tool_management/wizard/wizard.py
@@ -214,7 +214,8 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
         }
         self.env['sf.functional.tool.assembly'].search([
             ('machine_tool_name_id', '=', self.machine_tool_name_id.id),
-            ('cutter_spacing_code', '=', self.cutter_spacing_code)
+            ('cutter_spacing_code', '=', self.cutter_spacing_code),
+            ('assemble_status', '=', '0'),
         ]).write(desc_1)
 
         # 封装功能刀具数据
@@ -244,10 +245,31 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
             # 如果是新刀，则创建功能刀具列表、
             self.env['sf.functional.cutting.tool.entity'].create(desc_2)
         else:
-            record = self.env['sf.functional.cutting.tool.entity'].search([
-                ('code', '=', self.code)])
+            record = self.env['sf.functional.cutting.tool.entity'].search([('code', '=', self.code)])
             # 创建功能刀具缓存信息
-            self.env['sf.functional.cutting.tool.entity.cache'].create(record)
+            self.env['sf.functional.cutting.tool.entity.cache'].create({
+                'code': record.code,
+                'name': record.name,
+                'mrs_cutting_tool_type_id': record.mrs_cutting_tool_type_id.id,
+                'mrs_cutting_tool_model_id': record.mrs_cutting_tool_model_id.id,
+                'mrs_cutting_tool_integral_model_ids': record.mrs_cutting_tool_integral_model_ids.ids,
+                'mrs_cutting_tool_blade_model_ids': record.mrs_cutting_tool_blade_model_ids.ids,
+                'mrs_cutting_tool_cutterbar_model_ids': record.mrs_cutting_tool_cutterbar_model_ids.ids,
+                'mrs_cutting_tool_cutterpad_model_ids': record.mrs_cutting_tool_cutterpad_model_ids.ids,
+                'mrs_cutting_tool_cutterhandle_model_ids': record.mrs_cutting_tool_cutterhandle_model_ids.ids,
+                'mrs_cutting_tool_cutterhead_model_ids': record.mrs_cutting_tool_cutterhead_model_ids.ids,
+                'diameter': record.diameter,
+                'tool_grade': record.tool_grade,
+                'machining_accuracy': record.machining_accuracy,
+                'tool_length': record.tool_length,
+                'blade_number': record.blade_number,
+                'integral_blade_length': record.integral_blade_length,
+                'effective_blade_length': record.effective_blade_length,
+                'max_life': record.max_life,
+                'is_standard': record.is_standard,
+                'applicable_range': record.applicable_range,
+                'image': record.image,
+            })
             # 修改功能刀具列表信息
             record.write(desc_2)
         # # 创建功能刀具预警、实时分布、出入库记录的新记录
@@ -281,26 +303,25 @@ class DeliveryOfCargoFromStorage(models.TransientModel):
         print(vals)
         if vals:
             for val in vals:
-                self.env['sf.functional.tool.assembly'].search([
+                print(val)
+                record = self.env['sf.functional.tool.assembly'].search([
                     ('functional_tool_code', '=', val.functional_tool_code),
-                    ('machine_tool_code', '=', val.machine_tool_code),
-                    ('name', '=', val.name.id),
-                    ('production_line_name_id', '=', val.production_line_name_id.id)
-                ]).write({
-                    'assemble_status': '2',
-                    'receive_person': self.env.user.name,
-                    'receive_time': fields.Datetime.now()
-                })
-
-                tool_assembly = self.env['sf.functional.tool.assembly'].search([
-                    ('functional_tool_code', '=', val.functional_tool_code),
-                    ('name', '=', val.name.id)
+                    ('assemble_status', '=', '1')
                 ])
                 # 判断装刀任务来源，如果来源于CAM装刀，则修改CAM装刀的计划执行状态
-                if tool_assembly.loading_task_source == '0':
+                if record.loading_task_source == '0':
                     self.env['sf.cam.work.order.program.knife.plan'].search([
                         ('functional_tool_code', '=', val.functional_tool_code),
                         ('functional_tool_name_id', '=', val.name.id)
                     ]).write({
                         'plan_execute_status': '2'
                     })
+
+                record.write({
+                    'assemble_status': '2',
+                    'receive_person': self.env.user.name,
+                    'receive_time': fields.Datetime.now()
+                })
+
+
+