解决冲突

2025-05-12 08:41:12 +08:00
parent b5339046b9 f040406002
commit 11ecad5ef2
14 changed files with 221 additions and 18 deletions
--- a/sf_manufacturing/wizard/rework_wizard.py
+++ b/sf_manufacturing/wizard/rework_wizard.py
@@ -268,6 +268,8 @@ class ReworkWizard(models.TransientModel):
                                            'cmm_ids': new_cnc_workorder.cmm_ids.sudo()._json_cmm_program(
                                                cnc_work.processing_panel, ret),
                                            'cnc_worksheet': old_cnc_rework.cnc_worksheet})
+                                    # 复制装夹图纸
+                                    new_cnc_workorder.processing_drawing = old_cnc_rework.processing_drawing
                                # ========== 处理装夹预调 【装夹图纸】 数据 ================
                                for new_pre_work in new_pre_workorder_ids:
                                    pre_rework = max(self.production_id.workorder_ids.filtered(