From af5b319d0cc350f85aaba152f44ac2abd34e185f Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Fri, 5 May 2023 21:08:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=95=8C=E9=9D=A2=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=EF=BC=8C=E4=BC=98=E5=8C=96opcua=E8=B6=85=E6=97=B6?=
 =?UTF-8?q?=E6=97=B6=E9=95=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_machine_connect/models/py2opcua.py            | 2 +-
 sf_machine_connect/views/SfWorkOrderBarcodes.xml | 2 +-
 sf_machine_connect/views/delivery_record.xml     | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/sf_machine_connect/models/py2opcua.py b/sf_machine_connect/models/py2opcua.py
index 479fa91c..2b00f394 100644
--- a/sf_machine_connect/models/py2opcua.py
+++ b/sf_machine_connect/models/py2opcua.py
@@ -7,7 +7,7 @@ class Py2opcua:
     """
 
     def __init__(self, url='opc.tcp://192.168.2.99:4840'):
-        self.client = Client(url)
+        self.client = Client(url, timeout=3600000)
 
     # 连接客户端
     # def connect(self):
diff --git a/sf_machine_connect/views/SfWorkOrderBarcodes.xml b/sf_machine_connect/views/SfWorkOrderBarcodes.xml
index 7c40593b..d1ba5126 100644
--- a/sf_machine_connect/views/SfWorkOrderBarcodes.xml
+++ b/sf_machine_connect/views/SfWorkOrderBarcodes.xml
@@ -13,7 +13,7 @@
         <field name="arch" type="xml">
             <xpath expr="//group//field[@name='processing_panel']" position="after">
                 <!-- invisible="1" -->
-                <field name="_barcode_scanned" widget="barcode_handler" string="扫码"/>
+                <field name="_barcode_scanned" widget="barcode_handler" string="扫码" attrs='{"invisible": [("routing_type","!=","装夹")]}'/>
             </xpath>
             <xpath expr="//page//field[@name='tray_code']" position="replace">
                 <field name="tray_code" widget="code"/>
diff --git a/sf_machine_connect/views/delivery_record.xml b/sf_machine_connect/views/delivery_record.xml
index 29bf5daa..b614a7bb 100644
--- a/sf_machine_connect/views/delivery_record.xml
+++ b/sf_machine_connect/views/delivery_record.xml
@@ -7,7 +7,7 @@
         <field name="arch" type="xml">
             <xpath expr="//page[last()-3]" position="before">
 <!--                <page string="下发记录" attrs='{"invisible": [("routing_type","!=","CNC加工")]}'>-->
-                <page string="下发记录">
+                <page string="下发记录" attrs='{"invisible": [("routing_type","!=","CNC加工")]}'>
                     <field name="delivery_records">
                         <tree create="false">
                             <field name="delivery_type"/>
@@ -17,7 +17,6 @@
                     </field>
 
 
-
                 </page>
             </xpath>
         </field>