From 3793d0a17441398b6bb4458faa72e6218104728a Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Tue, 18 Jun 2024 11:35:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A3=85=E5=A4=B9=E9=A2=84?=
 =?UTF-8?q?=E8=B0=83=E5=B7=A5=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 002c83aa..07409827 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -1,5 +1,5 @@
 import re
-
+import json
 import logging
 import base64
 import urllib.parse
@@ -1066,6 +1066,25 @@ class ResMrpWorkOrder(models.Model):
                     workorder.detection_report = base64.b64encode(open(report_file_path, 'rb').read())
                     return True
 
+    # 重新下发nc程序
+    def button_send_program_again(self):
+        try:
+            res = {'programming_no': self.production_id.programming_no}
+            configsettings = self.env['res.config.settings'].get_values()
+            config_header = Common.get_headers(self, configsettings['token'], configsettings['sf_secret_key'])
+            url = '/api/intelligent_programming/reset_state_again'
+            config_url = configsettings['sf_url'] + url
+            r = requests.post(config_url, json=res, data=None, headers=config_header)
+            r = r.json()
+            result = json.loads(r['result'])
+            if result['status'] == 1:
+                self.production_id.write({'work_state': '编程中', 'programming_state': '编程中'})
+            else:
+                raise UserError(result['message'])
+        except Exception as e:
+            logging.info('button_send_program_again error:%s' % e)
+            raise UserError("重新下发nc程序失败,请联系管理员")
+
 
 class CNCprocessing(models.Model):
     _name = 'sf.cnc.processing'
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index 11219363..26f8941d 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -151,7 +151,10 @@
                 <!--                         groups="sf_base.group_sf_mrp_user" -->
                 <!--                         attrs="{'invisible': ['|', '|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '!=', 'blocked'),('state','=','done')]}"/> -->
                 <button name="button_workpiece_delivery" type="object" string="工件配送" class="btn-primary"
-                        attrs="{'invisible': ['|',('routing_type','!=','装夹预调'),('is_delivery','=',True)]}"/>
+                        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')]}"/>
             </xpath>
             <xpath expr="//page[1]" position="before">
                 <page string="开料要求" attrs='{"invisible": [("routing_type","!=","切割")]}'>
@@ -214,7 +217,7 @@
                            attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/>
                     <field name="functional_fixture_type_id"
                            attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/>
-                    <field name="rfid_code" cache="True"
+                    <field name="rfid_code" force_save="1" readonly="1" cache="True"
                            attrs="{'invisible': [('rfid_code_old', '!=', False)]}"/>
                     <field name="rfid_code_old" readonly="1" attrs="{'invisible': [('rfid_code_old', '=', False)]}"/>
                 </group>
@@ -477,13 +480,13 @@
                 <page string="后置三元检测" attrs='{"invisible": [("routing_type","!=","CNC加工")]}'>
                     <group>
                         <field name="test_results" attrs='{"invisible":[("results","!=",False)]}'/>
-<!--                        <field name="is_remanufacture" attrs='{"invisible":[("test_results","!=","报废")]}'/>-->
-<!--                        <field name="is_fetchcnc"-->
-<!--                               attrs='{"invisible":["|",("test_results","=","合格"),("is_remanufacture","=",False)]}'/>-->
-<!--                        <field name="reason"-->
-<!--                               attrs='{"required":[("test_results","!=","合格")],"invisible":[("test_results","=","合格")]}'/>-->
-<!--                        <field name="detailed_reason" attrs='{"invisible":[("test_results","=","合格")]}'/>-->
-<!--                        <field name="results" readonly="1" attrs='{"invisible":[("results","!=","合格")]}'/>-->
+                        <!--                        <field name="is_remanufacture" attrs='{"invisible":[("test_results","!=","报废")]}'/>-->
+                        <!--                        <field name="is_fetchcnc"-->
+                        <!--                               attrs='{"invisible":["|",("test_results","=","合格"),("is_remanufacture","=",False)]}'/>-->
+                        <!--                        <field name="reason"-->
+                        <!--                               attrs='{"required":[("test_results","!=","合格")],"invisible":[("test_results","=","合格")]}'/>-->
+                        <!--                        <field name="detailed_reason" attrs='{"invisible":[("test_results","=","合格")]}'/>-->
+                        <!--                        <field name="results" readonly="1" attrs='{"invisible":[("results","!=","合格")]}'/>-->
                         <field name="detection_report" attrs='{"invisible":[("results","!=",False)]}'
                                widget="pdf_viewer"/>
                     </group>