From a953ca189e2e3f8ef28f1728352755811f6b0893 Mon Sep 17 00:00:00 2001
From: "JIKIMO-YXH\\xianghui" <3437689193@qq.com>
Date: Tue, 24 Oct 2023 17:11:37 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=B8=8B=E5=A4=B9=E5=85=B7=E7=B1=BB=E5=88=AB?=
 =?UTF-8?q?=E4=B8=8B=E7=9A=84=E9=9B=B6=E7=82=B9=E6=89=98=E7=9B=98=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E6=98=BE=E7=A4=BA=EF=BC=9B2=E3=80=81=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7=E7=BB=84=E8=A3=85?=
 =?UTF-8?q?=E5=8D=95=E7=9A=84=E5=88=80=E5=85=B7=E7=89=A9=E6=96=99=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=B8=83=E5=B1=80=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_dlm/views/product_template_view.xml       |  15 +-
 sf_tool_management/views/tool_base_views.xml | 149 ++++++-------------
 2 files changed, 54 insertions(+), 110 deletions(-)

diff --git a/sf_dlm/views/product_template_view.xml b/sf_dlm/views/product_template_view.xml
index fbc12cee..a1322117 100644
--- a/sf_dlm/views/product_template_view.xml
+++ b/sf_dlm/views/product_template_view.xml
@@ -398,11 +398,10 @@
                         </group>
                     </page>
                     <page string="夹具物料参数" attrs="{'invisible': [('categ_type', '!=', '夹具')]}">
-                        <group attrs='{"invisible": [("fixture_material_type","not in",("气动夹具","转接板(锁板)夹具","磁吸夹具","虎钳夹具","零点卡盘"))]}'>
+                        <group attrs='{"invisible": [("fixture_material_type","not in",("气动夹具","转接板(锁板)夹具","磁吸夹具","虎钳夹具","零点卡盘","零点托盘"))]}'>
                             <group>
                                 <field name="brand_id"/>
-                                <field name="fixture_multi_mounting_type_id" options="{'no_create': True}"
-                                       attrs="{'required': [('categ_type', '=', '夹具')]}"/>
+                                <field name="fixture_multi_mounting_type_id" options="{'no_create': True}"/>
                                 <label for="tool_length" string="尺寸(mm)"/>
                                 <div class="o_address_format">
                                     <label for="tool_length" string="长"/>
@@ -419,9 +418,9 @@
                                 </div>
                                 <field name="tool_weight"></field>
                                 <label for="fixture_clamp_workpiece_length_max" string="夹持工件最大尺寸(mm)"
-                                       attrs='{"invisible": [("fixture_material_type","=",("零点卡盘"))]}'/>
+                                       attrs='{"invisible": [("fixture_material_type","in",("零点卡盘","零点托盘"))]}'/>
                                 <div class="o_address_format"
-                                     attrs='{"invisible": [("fixture_material_type","=",("零点卡盘"))]}'>
+                                     attrs='{"invisible": [("fixture_material_type","in",("零点卡盘","零点托盘"))]}'>
                                     <label for="fixture_clamp_workpiece_length_max" string="长"/>
                                     <field name="fixture_clamp_workpiece_length_max" class="o_address_zip"
                                            options="{'format': false}"
@@ -438,7 +437,7 @@
                                            attrs="{'required': [('fixture_material_type', 'in',('气动托盘','转接板(锁板)夹具','磁吸夹具','虎钳夹具'))]}"/>
                                 </div>
                                 <field name="fixture_clamp_workpiece_diameter_max"
-                                       attrs="{'invisible': [('fixture_material_type','=','零点卡盘')],'required': [('fixture_material_type', 'in',('气动夹具','转接板(锁板)夹具','磁吸夹具','虎钳夹具'))]}"/>
+                                       attrs="{'invisible': [('fixture_material_type','in',('零点卡盘','零点托盘'))],'required': [('fixture_material_type', 'in',('气动夹具','转接板(锁板)夹具','磁吸夹具','虎钳夹具'))]}"/>
                                 <field name="fixture_maximum_carrying_weight"></field>
                                 <field name="fixture_maximum_clamping_force"></field>
                             </group>
@@ -453,10 +452,10 @@
                                 <field name="fixture_screw_size"
                                        attrs='{"invisible": [("fixture_material_type","!=",("转接板(锁板)夹具"))]}'/>
                                 <field name="fixture_driving_way"
-                                       attrs='{"invisible": [("fixture_material_type","not in",("虎钳夹具","零点卡盘"))]}'/>
+                                       attrs='{"invisible": [("fixture_material_type","not in",("虎钳夹具","零点卡盘","零点托盘"))]}'/>
                                 <field name="fixture_apply_machine_tool_type_ids" options="{'no_create': True}"
                                        widget="many2many_tags"
-                                       attrs='{"invisible": [("fixture_material_type","!=",("零点卡盘"))]}'/>
+                                       attrs='{"invisible": [("fixture_material_type","not in",("零点卡盘","零点托盘"))]}'/>
                             </group>
                         </group>
 
diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml
index 1e079896..0e9f7386 100644
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -1101,6 +1101,8 @@
                                <field name="functional_tool_diameter"/>
                                <field name="functional_tool_length"/>
                                <field name="functional_tool_cutting_type"/>
+<!--                               <field name="barcode"/>-->
+<!--                               <field name="barcode_image"/>-->
                            </group>
                        </group>
 
@@ -1125,78 +1127,58 @@
                                 </group>
                                 <group>
                                     <group col="1">
-                                        <group col="1" attrs="{'invisible': [('integral_code_id', '=', False)]}">
-                                            <div>
-                                               <separator string="整体式刀具:" style="font-size: 13px;"/>
-                                            </div>
-                                            <group>
-                                                <group>
-                                                    <field name="integral_code_id" placeholder="请选择" string="序列号"
-                                                           options="{'no_create': True, 'no_quick_create': True}"/>
-                                                </group>
-                                            </group>
-                                            <group col="3">
-                                                 <group>
-                                                    <field name="integral_name" string="名称"/>
-                                                </group>
-                                                <group>
-                                                    <field name="cutting_tool_integral_model_id" string="型号"/>
-                                                </group>
-                                                <group>
-                                                    <field name="sf_tool_brand_id_1" string="品牌"/>
-                                                </group>
-                                            </group>
-                                        </group>
-                                    </group>
-                                </group>
-                                <group>
-                                    <group col="1">
-                                        <group col="1" attrs="{'invisible': [('blade_code_id', '=', False)]}">
-                                            <div>
-                                               <separator string="刀片:" style="font-size: 13px;"/>
-                                            </div>
-                                            <group>
-                                                <group>
-                                                    <field name="blade_code_id" placeholder="请选择" string="序列号"
-                                                           options="{'no_create': True, 'no_quick_create': True}"/>
-                                                </group>
-                                            </group>
-                                            <group col="3">
-                                                 <group>
-                                                    <field name="blade_name" string="名称"/>
-                                                </group>
-                                                <group>
-                                                    <field name="cutting_tool_blade_model_id" string="型号"/>
-                                                </group>
-                                                <group>
-                                                    <field name="sf_tool_brand_id_2" string="品牌"/>
-                                                </group>
-                                            </group>
-                                        </group>
                                         <group col="1">
                                             <div>
                                                <separator string="刀柄:" style="font-size: 13px;"/>
                                             </div>
                                             <group>
-                                                <group>
-                                                    <field name="handle_code_id" string="序列号" placeholder="请选择"
-                                                           options="{'no_create': True, 'no_quick_create': True}"/>
-                                                </group>
+                                                <field name="handle_code_id" string="序列号" placeholder="请选择"
+                                                       options="{'no_create': True, 'no_quick_create': True}"/>
+                                                <field name="handle_name" string="名称"/>
+                                                <field name="cutting_tool_cutterhandle_model_id" string="型号"/>
+                                                <field name="sf_tool_brand_id_5" string="品牌"/>
                                             </group>
-                                            <group col="3">
-                                                 <group>
-                                                    <field name="handle_name" string="名称"/>
-                                                </group>
-                                                <group>
-                                                    <field name="cutting_tool_cutterhandle_model_id" string="型号"/>
-                                                </group>
-                                                <group>
-                                                   <field name="sf_tool_brand_id_5" string="品牌"/>
-                                                </group>
+                                        </group>
+                                        <group col="1" attrs="{'invisible': [('integral_code_id', '=', False)]}">
+                                            <div>
+                                               <separator string="整体式刀具:" style="font-size: 13px;"/>
+                                            </div>
+                                            <group>
+                                                <field name="integral_code_id" placeholder="请选择" string="序列号"
+                                                       options="{'no_create': True, 'no_quick_create': True}"/>
+                                                <field name="integral_name" string="名称"/>
+                                                <field name="cutting_tool_integral_model_id" string="型号"/>
+                                                <field name="sf_tool_brand_id_1" string="品牌"/>
+                                            </group>
+                                        </group>
+                                        <group col="1" attrs="{'invisible': [('blade_code_id', '=', False)]}">
+                                            <div>
+                                               <separator string="刀片:" style="font-size: 13px;"/>
+                                            </div>
+                                            <group>
+                                                <field name="blade_code_id" placeholder="请选择" string="序列号"
+                                                       options="{'no_create': True, 'no_quick_create': True}"/>
+                                                <field name="blade_name" string="名称"/>
+                                                <field name="cutting_tool_blade_model_id" string="型号"/>
+                                                <field name="sf_tool_brand_id_2" string="品牌"/>
                                             </group>
                                         </group>
                                     </group>
                                     <group col="1">
+                                        <group col="1">
+                                            <div>
+                                               <separator string="夹头:" style="font-size: 13px;"/>
+                                            </div>
+                                            <group>
+                                                <group>
+                                                    <field name="chuck_code_id" string="序列号" placeholder="请选择"
+                                                           options="{'no_create': True, 'no_quick_create': True}"/>
+                                                    <field name="chuck_name" string="名称"/>
+                                                    <field name="cutting_tool_cutterhead_model_id" string="型号"/>
+                                                    <field name="sf_tool_brand_id_6" string="品牌"/>
+                                                </group>
+                                            </group>
+                                        </group>
                                         <group col="1" attrs="{'invisible': [('bar_code_id', '=', False)]}">
                                             <div>
                                                <separator string="刀杆:" style="font-size: 13px;"/>
@@ -1205,17 +1187,9 @@
                                                 <group>
                                                     <field name="bar_code_id" placeholder="请选择" string="序列号"
                                                            options="{'no_create': True, 'no_quick_create': True}"/>
-                                                </group>
-                                            </group>
-                                            <group col="3">
-                                                 <group>
                                                     <field name="bar_name" string="名称"/>
-                                                </group>
-                                                <group>
                                                     <field name="cutting_tool_cutterbar_model_id" string="型号"/>
-                                                </group>
-                                                <group>
-                                                   <field name="sf_tool_brand_id_3" string="品牌"/>
+                                                    <field name="sf_tool_brand_id_3" string="品牌"/>
                                                 </group>
                                             </group>
                                         </group>
@@ -1227,43 +1201,14 @@
                                                 <group>
                                                     <field name="pad_code_id" placeholder="请选择" string="序列号"
                                                            options="{'no_create': True, 'no_quick_create': True}"/>
-                                              </group>
-                                            </group>
-                                            <group col="3">
-                                                 <group>
                                                     <field name="pad_name" string="名称"/>
-                                                </group>
-                                                <group>
                                                     <field name="cutting_tool_cutterpad_model_id" string="型号"/>
-                                                </group>
-                                                <group>
-                                                   <field name="sf_tool_brand_id_4" string="品牌"/>
-                                                </group>
-                                            </group>
-                                        </group>
-                                        <group col="1">
-                                            <div>
-                                               <separator string="夹头:" style="font-size: 13px;"/>
-                                            </div>
-                                            <group>
-                                                <group>
-                                                    <field name="chuck_code_id" string="序列号" placeholder="请选择"
-                                                           options="{'no_create': True, 'no_quick_create': True}"/>
-                                                </group>
-                                            </group>
-                                            <group col="3">
-                                                 <group>
-                                                    <field name="chuck_name" string="名称"/>
-                                                </group>
-                                                <group>
-                                                    <field name="cutting_tool_cutterhead_model_id" string="型号"/>
-                                                </group>
-                                                <group>
-                                                   <field name="sf_tool_brand_id_6" string="品牌"/>
+                                                    <field name="sf_tool_brand_id_4" string="品牌"/>
                                                 </group>
                                             </group>
                                         </group>
                                     </group>
+
 <!--                                   <group>-->
 <!--                                       <field name="integral_code_id"/>-->
 <!--                                       <field name="cutting_tool_integral_model_id"/>-->