From 659651b930456cb096e9577e921ee3261f24d53e Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Mon, 27 Feb 2023 14:52:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0sf.cnc.processing=E7=BC=BA?=
 =?UTF-8?q?=E7=9C=81=E8=A7=86=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_machine_connect/__manifest__.py            |  4 +--
 sf_machine_connect/views/compensation.xml     |  7 +++--
 sf_machine_connect/views/default_delivery.xml | 27 +++++++++++++++++--
 3 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/sf_machine_connect/__manifest__.py b/sf_machine_connect/__manifest__.py
index 89389496..af66a542 100644
--- a/sf_machine_connect/__manifest__.py
+++ b/sf_machine_connect/__manifest__.py
@@ -19,16 +19,16 @@
         'security/ir.model.access.csv',
         'wizard/up_select.xml',
         'views/default_delivery.xml',
-        'views/delivery_record.xml',
+        'views/ftp_button.xml',
 
         'views/compensation.xml',
-        'views/ftp_button.xml',
 
         'views/SfWorkOrderBarcodes.xml',
         'views/WorkCenterBarcodes.xml',
         'views/Stock_picking_Barcodes.xml',
         'views/machine_monitor.xml',
         'views/machine_info_present.xml',
+        'views/delivery_record.xml',
 
     ],
 
diff --git a/sf_machine_connect/views/compensation.xml b/sf_machine_connect/views/compensation.xml
index 098af5fd..8a82ea49 100644
--- a/sf_machine_connect/views/compensation.xml
+++ b/sf_machine_connect/views/compensation.xml
@@ -22,9 +22,12 @@
 <!--                                <field name="button_up_all_state" attrs='{"invisible": ["|",-->
 <!--                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>-->
                                 <button string="一键下发" name="up_all" type="object" style="text-align: right;" confirm="是否确认一键下发"
-                                    class="btn-primary" context="{'default_workorder_id': id}"/>
+                                    class="btn-primary" context="{'default_workorder_id': id}"  attrs='{"invisible": ["|",
+                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>
                                 <span>&#32;</span>
-                                <button string="合并下发" id="action_up_select" name="%(sf_machine_connect.action_up_select)d" type="action" class="btn-primary" context="{'default_workorder_id': id}"/>
+                                <button string="合并下发" id="action_up_select" name="%(sf_machine_connect.action_up_select)d"
+                                type="action" class="btn-primary" context="{'default_workorder_id': id}"  attrs='{"invisible": ["|",
+                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>
                             </div>
                         </div>
                     </group>
diff --git a/sf_machine_connect/views/default_delivery.xml b/sf_machine_connect/views/default_delivery.xml
index 832ba38c..62f1fcdc 100644
--- a/sf_machine_connect/views/default_delivery.xml
+++ b/sf_machine_connect/views/default_delivery.xml
@@ -1,6 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
+<!--     缺省sf.cnc.processing视图 -->
+    <record id="sf_cnc_processing_tree" model="ir.ui.view">
+		<field name="name">sf.cnc.processing.tree</field>
+		<field name="model">sf.cnc.processing</field>
+		<field name="arch" type="xml">
+            <tree>
+                <field name="sequence_number"/>
+                <field name="program_name"/>
+                <field name="cnc_id" string="文件"/>
+                <field name="cutting_tool_name"/>
+                <field name="cutting_tool_no"/>
+                <field name="processing_type"/>
+                <field name="margin_x_y"/>
+                <field name="margin_z"/>
+                <field name="depth_of_processing_z"/>
+                <field name="cutting_tool_extension_length"/>
+                <field name="cutting_tool_handle_type"/>
+                <field name="estimated_processing_time"/>
+                <field name="remark"/>
+            </tree>
+		</field>
+	</record>
+
 	<record id="delivery_tree" model="ir.ui.view">
 		<field name="name">delivery.record.tree</field>
 		<field name="model">delivery.record</field>
@@ -13,8 +36,8 @@
 
 		</field>
 	</record>
-	<record id="delivery_tree" model="ir.ui.view">
-		<field name="name">delivery.record.tree</field>
+	<record id="delivery_form" model="ir.ui.view">
+		<field name="name">delivery.record.form</field>
 		<field name="model">delivery.record</field>
 		<field name="arch" type="xml">
             <form>