diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index 7a6c494b..d7181fdf 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -1256,9 +1256,9 @@ class MrpProduction(models.Model):
                 'default_production_id': self.id,
                 'default_workorder_ids': workorder_ids.ids if workorder_ids.ids != [] else self.workorder_ids.ids,
                 'default_hidden_workorder_ids': ','.join(map(str, work_id_list)) if work_id_list != [] else '',
-                'default_reprogramming_num': cloud_programming.get('reprogramming_num'),
-                'default_programming_state': cloud_programming.get('programming_state'),
-                'default_is_reprogramming': True if cloud_programming.get('programming_state') in ['已下发'] else False
+                'default_reprogramming_num': cloud_programming.get('reprogramming_num') if cloud_programming else '',
+                'default_programming_state': cloud_programming.get('programming_state') if cloud_programming else '',
+                'default_is_reprogramming': True if cloud_programming and (cloud_programming.get('programming_state') in ['已下发']) else False
             }
         }
 
diff --git a/sf_manufacturing/wizard/rework_wizard.py b/sf_manufacturing/wizard/rework_wizard.py
index d7514a8a..a3ac96ed 100644
--- a/sf_manufacturing/wizard/rework_wizard.py
+++ b/sf_manufacturing/wizard/rework_wizard.py
@@ -281,7 +281,8 @@ class ReworkWizard(models.TransientModel):
                                 {'programming_state': '编程中', 'work_state': '编程中', 'is_rework': True})
                 # =================================================
                 if self.production_id.state == 'progress':
-                    self.production_id.write({'programming_state': '已编程', 'work_state': '已编程'})
+                    if self.programming_state:
+                        self.production_id.write({'programming_state': '已编程', 'work_state': '已编程'})
                     if self.reprogramming_num >= 1 and self.programming_state == '已编程':
                         productions_not_delivered = self.env['mrp.production'].search(
                             [('programming_no', '=', self.production_id.programming_no),