From 89eec3250add7e42f7a1da9588ab0db724910109 Mon Sep 17 00:00:00 2001
From: yuxianghui <1608204036@qq.com>
Date: Wed, 19 Jul 2023 11:24:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=80=E5=85=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=BC=B9=E7=AA=97=E7=95=8C=E9=9D=A2=E7=9A=84=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_tool_management/views/tool_base_views.xml |  39 +++---
 sf_tool_management/wizard/wizard_view.xml    | 123 +++++++++----------
 2 files changed, 75 insertions(+), 87 deletions(-)

diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml
index aae16a8a..4326b0c6 100644
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -22,7 +22,6 @@
                     <field name="is_standard" optional="show"/>
                     <field name="applicable_range" optional="show"/>
                     <field name="image" widget='image' optional="show"/>
-
                 </tree>
             </field>
         </record>
@@ -126,20 +125,18 @@
             <field name="arch" type="xml">
                 <tree>
 <!--                    <field name="order"/>-->
-                    <field name="code"/>
-                    <field name="name"/>
                     <field name="mrs_cutting_tool_type_id"/>
                     <field name="mrs_cutting_tool_model_id"/>
-                    <field name="diameter" optional="hide"/>
-                    <field name="tool_grade" optional="hide"/>
-                    <field name="machining_accuracy" optional="hide"/>
-                    <field name="tool_length" optional="hide"/>
-                    <field name="blade_number" optional="hide"/>
-                    <field name="integral_blade_length" optional="hide"/>
-                    <field name="effective_blade_length" optional="hide"/>
-                    <field name="max_life" optional="hide"/>
-                    <field name="is_standard" optional="hide"/>
-                    <field name="applicable_range" optional="hide"/>
+                    <field name="diameter" optional="show"/>
+                    <field name="tool_grade" optional="show"/>
+                    <field name="machining_accuracy" optional="show"/>
+                    <field name="tool_length" optional="show"/>
+                    <field name="blade_number" optional="show"/>
+                    <field name="integral_blade_length" optional="show"/>
+                    <field name="effective_blade_length" optional="show"/>
+                    <field name="max_life" optional="show"/>
+                    <field name="is_standard" optional="show"/>
+                    <field name="applicable_range" optional="show"/>
                     <field name="tool_stock_num" optional="show"/>
                     <field name="side_shelf_num" optional="show"/>
                     <field name="on_tool_stock_num" optional="show"/>
@@ -204,11 +201,11 @@
                     <button string="转移"
                             name="%(sf_tool_management.sf_tool_transfer_request_information_act)d"
                             type="action"
-                            context="{  'default_name':name,
+                            context="{  'default_CNC_machine_table':name,
                                     'default_machine_tool_code': machine_tool_code,
                                     'default_cutter_spacing_code': cutter_spacing_code,
                                     'default_functional_tool_code': functional_tool_code,
-                                    'default_name': functional_tool_name,
+                                    'default_functional_tool_name': functional_tool_name,
                                     'default_functional_tool_type': functional_tool_type}"
                             class="btn-primary"
                             attrs="{'invisible': [('status', '!=', '0')]}"
@@ -300,7 +297,7 @@
                     <field name="applicant"/>
                     <field name="reason_for_applying"/>
                     <field name="remark"/>
-                    <button string="装刀申请"
+                    <button string="申请装刀"
                             name="%(sf_tool_management.sf_apply_for_tooling_act)d"
                             type="action"
                             context="{  'default_name':name,
@@ -308,7 +305,7 @@
                                     'default_machine_table_name': machine_table_name,
                                     'default_cam_cutter_spacing_code': cam_cutter_spacing_code,
                                     'default_functional_tool_code': functional_tool_code,
-                                    'default_name': functional_tool_name,
+                                    'default_functional_tool_name': functional_tool_name,
                                     'default_functional_tool_type': functional_tool_type,
                                     'default_diameter': diameter,
                                     'default_tool_loading_length': tool_loading_length,
@@ -324,7 +321,7 @@
                             class="btn-primary"
                             attrs="{'invisible': [('plan_execute_status', '!=', '0')]}"
                     />
-                    <button string="装刀申请" name="" class="btn-primary" attrs="{'invisible': [('plan_execute_status', '=', '0')]}"/>
+                    <button string="申请装刀" name="" class="btn-primary" attrs="{'invisible': [('plan_execute_status', '=', '0')]}"/>
                     <button string="撤回" name="revocation" type="object" class="btn-primary" attrs="{'invisible': [('plan_execute_status', '!=', '1')]}"/>
                     <button string="撤回" name="" class="btn-primary" attrs="{'invisible': [('plan_execute_status', '=', '1')]}"/>
                 </tree>
@@ -404,7 +401,7 @@
                             context="{
                                 'default_machine_tool_name': machine_tool_name,
                                 'default_cutter_spacing_code': cutter_spacing_code,
-                                'default_name': name,
+                                'default_functional_tool_name': name,
                                 'default_functional_tool_type': functional_tool_type,
                                 'default_functional_tool_length': functional_tool_length,
                                 'default_effective_length': None,
@@ -420,12 +417,12 @@
                     <button string="取消组装" name="cancel_functional_tool_assembly" type="object" attrs="{'invisible': [('assemble_status', '!=', '1')]}" class="btn-primary"/>
                     <button string="取消组装" name="" attrs="{'invisible': [('assemble_status', '=', '1')]}" class="btn-primary"/>
 
-                    <button string="自动打印二维码" name="automatic_printing_of_QR_code" type="object" class="btn-primary"/>
+                    <button string="自动打印二维码" name="automatic_printing_of_QR_code" type="object" attrs="{'invisible': [('assemble_status', '=', '0')]}" class="btn-primary" />
 
                     <button string="出库" name="show_popup" type="object" attrs="{'invisible': [('assemble_status', '!=', '1')]}" class="btn-primary"/>
                     <button string="出库" name="" attrs="{'invisible': [('assemble_status', '=', '1')]}" class="btn-primary"/>
 
-                    <button string="组装单打印" name="assemble_single_print" type="object" class="btn-primary"/>
+                    <button string="组装单打印" name="assemble_single_print" type="object" attrs="{'invisible': [('assemble_status', '=', '0')]}"  class="btn-primary"/>
 
                     <field name="check_box_1" attrs="{'readonly': [('assemble_status', '!=', '1')]}"/>
 
diff --git a/sf_tool_management/wizard/wizard_view.xml b/sf_tool_management/wizard/wizard_view.xml
index b0b345df..32a2e8c0 100644
--- a/sf_tool_management/wizard/wizard_view.xml
+++ b/sf_tool_management/wizard/wizard_view.xml
@@ -7,7 +7,7 @@
             <field name="arch" type="xml">
                  <form string="换刀需求信息">
                     <sheet>
-                        <group>
+                        <group string="机床信息">
                             <group>
                                 <group>
                                      <field name="name"/>
@@ -20,9 +20,13 @@
                                 <field name="cutter_spacing_code"/>
                             </group>
                         </group>
-                        <group>
-                            <field name="replacement_tool_name"/>
-                            <field name="replacement_tool_type"/>
+                        <group string="刀具信息">
+                            <group>
+                                <field name="replacement_tool_name"/>
+                            </group>
+                            <group>
+                                <field name="replacement_tool_type"/>
+                            </group>
                         </group>
                         <group>
                             <group>
@@ -63,41 +67,37 @@
             <field name="arch" type="xml">
                  <form string="刀具转移申请信息">
                     <sheet>
-                        <group>
+                        <group string="机床信息">
                             <group>
-                                <group>
-                                     <field name="CNC_machine_table"/>
-                                     <field name="functional_tool_code" string="刀具编码"/>
-                                </group>
-                                <group>
-                                    <field name="machine_tool_code"/>
-                                    <field name="functional_tool_name" string="刀具名称"/>
-                                </group>
+                                <field name="CNC_machine_table"/>
+                                <field name="cutter_spacing_code"/>
                             </group>
                             <group>
-                                <field name="cutter_spacing_code"/>
-                                <field name="functional_tool_type" string="刀具类型"/>
+                                <field name="machine_tool_code"/>
                             </group>
                         </group>
-                        <group>
+                        <group string="刀具信息">
+                             <group>
+                                <field name="functional_tool_name" string="刀具名称"/>
+                                <field name="functional_tool_type" string="刀具类型"/>
+                            </group>
+                            <group>
+                                <field name="functional_tool_code" string="刀具编码"/>
+                            </group>
+                        </group>
+                        <group string="刀具转移">
                             <group>
                                 <field name="transfer_target" widget="radio" options="{'horizontal': true}"/>
                             </group>
                         </group>
                         <group>
                             <group>
-                                <group>
-                                    <field name="new_cnc_machine_table" attrs="{'readonly': [('transfer_target', '!=', '机台')]}"/>
-                                    <field name="new_machine_tool_code" attrs="{'readonly': [('transfer_target', '!=', '机台')]}"/>
-                                    <field name="new_cutter_spacing_code" attrs="{'readonly': [('transfer_target', '!=', '机台')]}"/>
-                                </group>
-                                <group>
-                                    <field name="magazine_tool_warehouse_district" attrs="{'readonly': [('transfer_target', '!=', '线边刀库')]}"/>
-                                    <field name="magazine_tool_warehouse_position" attrs="{'readonly': [('transfer_target', '!=', '线边刀库')]}"/>
-                                </group>
-                            </group>
-                            <group>
-                                <field name="tool_room_warehouse_district" attrs="{'readonly': [('transfer_target', '!=', '刀具房')]}"/>
+                                <field name="new_cnc_machine_table" attrs="{'invisible': [('transfer_target', '!=', '机台')]}"/>
+                                <field name="new_machine_tool_code" attrs="{'invisible': [('transfer_target', '!=', '机台')]}"/>
+                                <field name="new_cutter_spacing_code" attrs="{'invisible': [('transfer_target', '!=', '机台')]}"/>
+                                <field name="magazine_tool_warehouse_district" attrs="{'invisible': [('transfer_target', '!=', '线边刀库')]}"/>
+                                <field name="magazine_tool_warehouse_position" attrs="{'invisible': [('transfer_target', '!=', '线边刀库')]}"/>
+                                <field name="tool_room_warehouse_district" attrs="{'invisible': [('transfer_target', '!=', '刀具房')]}"/>
                                 <field name="tool_room_warehouse_position" attrs="{'invisible': [('transfer_target', '!=', '刀具房')]}"/>
                             </group>
                         </group>
@@ -127,37 +127,39 @@
             <field name="arch" type="xml">
                  <form string="申请装刀">
                     <sheet>
-                        <group>
+                        <group string="基础信息">
                             <group>
                                 <field name="ticket_task_code" string="工单编号"/>
-                                <field name="machine_table_name" string="CAM指定机床"/>
                             </group>
+                        </group>
+                        <group>
                             <group>
+                                <field name="machine_table_name" string="CAM指定机床"/>
                                 <field name="cam_procedure_code" string="CAM程序编号"/>
                                 <field name="cam_cutter_spacing_code" string="CAM指定刀位号"/>
                             </group>
-                        </group>
-
-                        <group>
                             <group>
-                                <group>
-                                    <field name="diameter" string="直径"/>
-                                    <field name="tool_included_angle"/>
-                                    <field name="whether_standard_tool"/>
-                                </group>
-                                <group>
-                                    <field name="tool_loading_length" string="刀尖角"/>
-                                    <field name="L_D"/>
-                                    <field name="need_knife_time"/>
-                                </group>
+                                <field name="functional_tool_name"/>
+                                <field name="functional_tool_code"/>
+                                <field name="functional_tool_type"/>
                             </group>
+                        </group>
+                        <group string="数据信息">
                             <group>
+                                <field name="diameter" string="直径"/>
+                                <field name="tool_included_angle" string="刀尖角"/>
                                 <field name="clearance_length"/>
-                                    <field name="coarse_middle_thin"/>
-                                    <field name="required_cutting_time" string="需切削时长"/>
+                                <field name="need_knife_time"/>
+                                <field name="whether_standard_tool"/>
+                            </group>
+                            <group>
+                                <field name="tool_loading_length"/>
+                                <field name="L_D"/>
+                                <field name="coarse_middle_thin"/>
+                                <field name="required_cutting_time" string="需切削时长"/>
                             </group>
                         </group>
-                        <group>
+                        <group string="其他">
                             <field name="reason_for_applying"/>
                         </group>
                     </sheet>
@@ -188,29 +190,16 @@
                     <sheet>
                         <group string="功能刀具申请信息">
                             <group>
-                                <group>
-                                    <field name="machine_tool_name"/>
-                                </group>
-                                <group>
-                                    <field name="cutter_spacing_code"/>
-                                </group>
-                            </group><group>
-                                <group>
-                                    <field name="functional_tool_name"/>
-                                </group>
-                                <group>
-                                    <field name="functional_tool_type"/>
-                                </group>
-                            </group>
-                        </group>
-                        <group>
-                            <group>
+                                <field name="machine_tool_name"/>
+                                <field name="functional_tool_name"/>
                                 <field name="functional_tool_length"/>
                                 <field name="effective_length"/>
                                 <field name="functional_tool_cutting_type"/>
                                 <field name="required_cutting_time"/>
                             </group>
                             <group>
+                                <field name="cutter_spacing_code"/>
+                                <field name="functional_tool_type"/>
                                 <field name="functional_tool_diameter"/>
                                 <field name="tool_included_angle"/>
                                 <field name="whether_standard_tool"/>
@@ -243,9 +232,11 @@
                             </group>
                         </group>
                         <group>
-                            <field name="cut_time"/>
-                            <field name="cut_length"/>
-                            <field name="cut_number"/>
+                            <group>
+                                <field name="cut_time"/>
+                                <field name="cut_length"/>
+                                <field name="cut_number"/>
+                            </group>
                         </group>
                     </sheet>
                      <footer>