From e5b730b2efcd82968858a46288a054bc3c5c1c88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E5=B0=A7?= <huyao@jikimo.com>
Date: Thu, 8 May 2025 21:21:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E7=BA=BF=E4=B8=8B=E8=BF=94?=
 =?UTF-8?q?=E5=B7=A5=E5=9C=A8=E4=B8=8D=E9=80=89=E6=8B=A9=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E7=BC=96=E7=A8=8B=E6=97=B6=E5=A4=8D=E5=88=B6=E5=8A=A0=E5=B7=A5?=
 =?UTF-8?q?=E5=9B=BE=E7=BA=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jikimo_purchase_request/views/stock_picking_views.xml | 2 +-
 sf_manufacturing/wizard/rework_wizard.py              | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/jikimo_purchase_request/views/stock_picking_views.xml b/jikimo_purchase_request/views/stock_picking_views.xml
index 25c11a1b..b96aea0c 100644
--- a/jikimo_purchase_request/views/stock_picking_views.xml
+++ b/jikimo_purchase_request/views/stock_picking_views.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-    <record id="mrp_production_inherited_form_purchase_request" model="ir.ui.view">
+    <record id="stock_pikcing_inherited_form_jikimo_purchase_request" model="ir.ui.view">
         <field name="name">stock.pikcing.inherited.form.jikimo.purchase.request</field>
         <field name="model">stock.picking</field>
         <field name="inherit_id" ref="stock.view_picking_form"/>
diff --git a/sf_manufacturing/wizard/rework_wizard.py b/sf_manufacturing/wizard/rework_wizard.py
index b6b657c1..cc3f5fb2 100644
--- 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(