From 47305a2e6146999ab507c3fea638821c3f7d5b37 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Tue, 18 Jun 2024 17:17:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0'=E6=98=AF=E5=90=A6=E9=87=8D?=
 =?UTF-8?q?=E6=96=B0=E4=B8=8B=E5=8F=91NC=E7=A8=8B=E5=BA=8F'=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_workorder.py      | 2 ++
 sf_manufacturing/views/mrp_workorder_view.xml | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 07409827..401788af 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -205,6 +205,7 @@ class ResMrpWorkOrder(models.Model):
         [("programming", "编程"), ("clamping", "返工"), ("cutter", "刀具"), ("operate computer", "操机"),
          ("technology", "工艺"), ("customer redrawing", "客户改图"), ("other", "其他"), ], string="原因", tracking=True)
     detailed_reason = fields.Text('详细原因')
+    is_send_program_again = fields.Boolean(string='是否重新下发NC程序', default=False)
 
     @api.onchange('rfid_code')
     def _onchange(self):
@@ -1078,6 +1079,7 @@ class ResMrpWorkOrder(models.Model):
             r = r.json()
             result = json.loads(r['result'])
             if result['status'] == 1:
+                self.write({'is_send_program_again': True})
                 self.production_id.write({'work_state': '编程中', 'programming_state': '编程中'})
             else:
                 raise UserError(result['message'])
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index 26f8941d..a5d902bf 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -117,6 +117,7 @@
                 <field name='user_permissions' invisible="1"/>
                 <field name='name' invisible="1"/>
                 <field name='is_delivery' invisible="1"/>
+                <field name='is_send_program_again' invisible="1"/>
                 <!--                 工单form页面的开始停工按钮等 -->
                 <!--                 <button name="button_start" type="object" string="开始" class="btn-success" -->
                 <!--                         attrs="{'invisible': ['|', '|', ('production_state', 'not in', ('pending_processing', 'pending_cam', 'pending_era_cam')), ('state','!=','ready'), ('routing_type', 'not in', ('装夹预调', 'CNC加工', '解除装夹'))]}" -->
@@ -154,7 +155,7 @@
                         attrs="{'invisible': ['|','|',('routing_type','!=','装夹预调'),('is_delivery','=',True),('state','!=','done')]}"/>
                 <button name="button_send_program_again" type="object" string="重新下发NC程序" class="btn-primary"
                         confirm="是否确认重新下发NC程序？"
-                        attrs="{'invisible': ['|', ('routing_type','!=','装夹预调'),('state','=','done')]}"/>
+                        attrs="{'invisible': ['|', '|', '|',('routing_type','!=','装夹预调'),('state','not in',['ready','progress']),('processing_drawing','=',False),('is_send_program_again','=',True)]}"/>
             </xpath>
             <xpath expr="//page[1]" position="before">
                 <page string="开料要求" attrs='{"invisible": [("routing_type","!=","切割")]}'>
@@ -296,7 +297,7 @@
                     </group>
                     <group string="加工图纸">
                         <!--                         隐藏加工图纸字段名 -->
-                        <field name="processing_drawing" widget="pdf_viewer" string=""/>
+                        <field name="processing_drawing" widget="pdf_viewer" string="" readonly="1"/>
                     </group>
                 </page>
                 <page string="前置三元检测定位参数" attrs='{"invisible": [("routing_type","!=","装夹预调")]}'>