diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 6da74cbc..b065284b 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -1064,14 +1064,16 @@ class ResMrpWorkOrder(models.Model):
             for workorder in record.production_id.workorder_ids:
                 if workorder.state != 'done':
                     is_production_id = False
-            if record.routing_type == '解除装夹':
+            if record.routing_type in ['解除装夹'] or (
+                    record.is_rework is True and record.routing_type in ['装夹预调']) or (
+                    record.test_results in ['返工', '报废'] and record.routing_type in ['CNC加工']):
                 for workorder in record.production_id.workorder_ids:
                     if workorder.processing_panel == record.processing_panel:
                         rfid_code = workorder.rfid_code
                         workorder.write({'rfid_code_old': rfid_code,
                                          'rfid_code': False})
-                        workorder.rfid_code_old = rfid_code
-                        workorder.rfid_code = False
+                        # workorder.rfid_code_old = rfid_code
+                        # workorder.rfid_code = False
             if is_production_id is True and record.routing_type in ['解除装夹', '表面工艺']:
                 logging.info('product_qty:%s' % record.production_id.product_qty)
                 for move_raw_id in record.production_id.move_raw_ids: