From 98d2aa756a34bccbef994e3679ed5eefc8a664f3 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Fri, 26 Jul 2024 11:49:33 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=A7=A3=E5=86=B3=20=20=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=88=80=E5=85=B7=E6=98=AF=E6=97=A0=E6=95=88=E5=88=80?=
 =?UTF-8?q?=E6=97=B6-=E5=88=B6=E9=80=A0=E8=AE=A2=E5=8D=95=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E8=BF=94=E5=B7=A5=E3=80=90=E7=94=B3=E8=AF=B7=E9=87=8D?=
 =?UTF-8?q?=E6=96=B0=E7=BC=96=E7=A8=8B=E3=80=91=E8=A6=81=E5=81=9A=E6=88=90?=
 =?UTF-8?q?=E5=BF=85=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/wizard/rework_wizard.py        |  2 ++
 sf_manufacturing/wizard/rework_wizard_views.xml | 10 ++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/sf_manufacturing/wizard/rework_wizard.py b/sf_manufacturing/wizard/rework_wizard.py
index f15f85d1..bf1224fb 100644
--- a/sf_manufacturing/wizard/rework_wizard.py
+++ b/sf_manufacturing/wizard/rework_wizard.py
@@ -31,6 +31,8 @@ class ReworkWizard(models.TransientModel):
          ('已下发', '已下发')],
         string='编程状态')
 
+    tool_state = fields.Selection(string='功能刀具状态', related='production_id.tool_state')
+
     def confirm(self):
         if self.routing_type in ['装夹预调', 'CNC加工']:
             self.workorder_id.is_rework = True
diff --git a/sf_manufacturing/wizard/rework_wizard_views.xml b/sf_manufacturing/wizard/rework_wizard_views.xml
index 7008e4b9..08e5f8ef 100644
--- a/sf_manufacturing/wizard/rework_wizard_views.xml
+++ b/sf_manufacturing/wizard/rework_wizard_views.xml
@@ -9,6 +9,7 @@
                     <field name="production_id" invisible="True"/>
                     <field name="workorder_id" invisible="True"/>
                     <field name="product_id" invisible="True"/>
+                    <field name="tool_state" invisible="True"/>
                     <field name="routing_type" invisible="True"/>
                     <group>
                         <field name="processing_panel_id" options="{'no_create': True}"
@@ -25,15 +26,16 @@
                                decoration-warning="programming_state =='编程中'"
                                decoration-danger="programming_state =='已编程'" readonly="1"/>
                     </div>
-                    <div attrs='{"invisible": ["|",("routing_type","in",["装夹预调","CNC加工"]),("programming_state","not in",["已下发"])]}'>
+                    <div attrs='{"invisible": ["|",("routing_type","in",["装夹预调","CNC加工"]),("programming_state","not in",["已下发"])],"readonly": [("tool_state", "=", "2")]}'>
                         <span style='font-weight:bold;'>申请重新编程
-                            <field name="is_reprogramming" force_save="1"/>
+                            <field name="is_reprogramming" force_save="1"
+                                   attrs='{"readonly": [("tool_state", "=", "2")]}'/>
                         </span>
                     </div>
-                    <div attrs='{"invisible": ["|",("routing_type","in",["装夹预调","CNC加工"]),("programming_state","in",["已下发"])],"readonly": [("is_reprogramming_readonly","=",False)]}'>
+                    <div attrs='{"invisible": ["|",("routing_type","in",["装夹预调","CNC加工"]),("programming_state","in",["已下发"])],"readonly": ["|",("is_reprogramming_readonly","=",False),("tool_state", "=", "2")]}'>
                         <span style='font-weight:bold;'>申请重新编程
                             <field name="is_reprogramming_readonly"
-                                   attrs='{"readonly": [("is_reprogramming_readonly","=",False)]}'/>
+                                   attrs='{"readonly": ["|",("is_reprogramming_readonly","=",False),("tool_state", "=", "2")]}'/>
                         </span>
                     </div>
                     <group>