diff --git a/sf_manufacturing/wizard/rework_wizard.py b/sf_manufacturing/wizard/rework_wizard.py
index cc3f5fb2..7fc935a0 100644
--- a/sf_manufacturing/wizard/rework_wizard.py
+++ b/sf_manufacturing/wizard/rework_wizard.py
@@ -127,9 +127,11 @@ class ReworkWizard(models.TransientModel):
                 clamp_workorder_ids = rework_workorder_ids.filtered(lambda rp: rp.routing_type == '装夹预调')
                 if clamp_workorder_ids:
                     for clamp_workorder_id in clamp_workorder_ids:
-                        self.production_id.workorder_ids.filtered(
-                            lambda wk: wk.processing_panel == clamp_workorder_id.processing_panel).write(
-                            {'rfid_code': None})
+                        rfid_code = clamp_workorder_id.rfid_code
+                        clamp_workorder_id.write({'rfid_code_old': rfid_code, 'rfid_code': False})
+                        self.production_id.workorder_ids.filtered(lambda wk: (
+                                wk.routing_type != '装夹预调' and
+                                wk.processing_panel == clamp_workorder_id.processing_panel)).write({'rfid_code': None})
                 # 返工工单状态设置为【返工】
                 rework_workorder_ids.write({'state': 'rework'})
                 # 查询返工工单对应的工艺设计记录，并调用方法拼接数据，用于创建新的工单
diff --git a/sf_warehouse/models/sync_common.py b/sf_warehouse/models/sync_common.py
index 18510917..3c6b23fd 100644
--- a/sf_warehouse/models/sync_common.py
+++ b/sf_warehouse/models/sync_common.py
@@ -121,18 +121,13 @@ class MrsShelfLocationDataSync(models.Model):
                         tool.tool_in_out_stock_location(location_id)
                         if tool:
                             location_id.product_sn_id = tool.barcode_id.id
-                            # 修改功能刀具标准状态值和已使用寿命值
+                            # 修改功能刀具标准状态值和已使用寿命值、功能刀具状态
                             if 'LifeStd' in item and 'LifeUse' in item:
                                 tool.sudo().write({
                                     'max_lifetime_value': item['LifeStd'],
-                                    'used_value': item['LifeUse']
+                                    'used_value': item['LifeUse'],
+                                    'functional_tool_status': item['State'],
                                 })
-                            # 修改功能刀具状态
-                            if item.get('State') == '报警':
-                                if tool.functional_tool_status != item.get('State'):
-                                    tool.sudo().write({
-                                        'functional_tool_status': item['State']
-                                    })
                         else:
                             location_id.product_sn_id = False
                             if item['RfidCode']: