From 43a49242c5c37845a96c0c33b5f456e3d462d861 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Thu, 12 Sep 2024 17:21:37 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=BB=84=E8=A3=85=E5=8D=95=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_tool_management/views/tool_base_views.xml | 180 +++++++++----------
 1 file changed, 87 insertions(+), 93 deletions(-)

diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml
index 0c492721..ab4912ce 100644
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -479,6 +479,10 @@
                         <button string="确认组装" name="functional_tool_assembly" type="object"
                                 attrs="{'invisible': [('assemble_status', 'not in', ['01'])]}"
                                 class="btn-primary"/>
+                        <button name="get_tool_preset_parameter" string="获取测量值"
+                                type="object" class="btn-primary"
+                                attrs="{'invisible': [('assemble_status', 'in', ['0','1','2'])]}"
+                        />
                         <field name="assemble_status" widget="statusbar" statusbar_visible="0,01,1"/>
                     </header>
                     <sheet>
@@ -524,11 +528,9 @@
                                             <div>
                                                 <separator string="刀柄:" style="font-size: 13px;"/>
                                             </div>
-
                                             <group>
                                                 <field name="handle_code_id" string="序列号" placeholder="请选择"
-                                                       options="{'no_create': True, 'no_quick_create': True}"
-                                                       attrs="{'readonly': [('assemble_status', 'in', ['1','2'])]}"/>
+                                                       options="{'no_create': True, 'no_quick_create': True}"/>
                                                 <field name="handle_freight_rfid" string="Rfid"/>
                                                 <field name="handle_product_id" string="名称"/>
                                                 <field name="cutting_tool_cutterhandle_model_id" string="型号"/>
@@ -537,53 +539,8 @@
                                             </group>
                                             <div>
                                                 <button string="更多" name="set_tool_lot" type="object"
-                                                        class="btn-primary" context="{'tool_type': '刀柄'}"/>
-                                            </div>
-                                        </group>
-                                        <group col="1"
-                                               attrs="{'invisible': [('bar_lot_id', '=', False),'|','|',('integral_lot_id', '!=', False),('pad_lot_id', '!=', False),('assemble_status', 'not in', ['0','01'])]}">
-                                            <div>
-                                                <separator string="刀杆:" style="font-size: 13px;"/>
-                                            </div>
-                                            <group>
-                                                <field name="bar_freight_barcode_id" string="货位"
-                                                       attrs="{'readonly': [('assemble_status', 'in', ['1','2'])]}"/>
-                                                <field name="bar_freight_lot_id" string="批次"
-                                                       attrs="{'invisible': [('assemble_status', 'in', ['1','2'])]}"/>
-                                                <field name="bar_lot_id" string="批次"
-                                                       attrs="{'invisible': [('assemble_status', 'in', ['0','01'])]}"/>
-                                                <field name="bar_product_id" string="名称"/>
-                                                <field name="cutting_tool_cutterbar_model_id" string="型号"/>
-                                                <field name="bar_specification_id" string="规格"/>
-                                                <field name="sf_tool_brand_id_3" string="品牌"/>
-                                            </group>
-                                            <div>
-                                                <button string="更多" name="set_tool_lot" type="object"
-                                                        class="btn-primary" context="{'tool_type': '刀杆'}"/>
-                                            </div>
-                                        </group>
-                                        <group col="1"
-                                               attrs="{'invisible': [('pad_lot_id', '=', False),'|','|',('integral_lot_id', '!=', False),('bar_lot_id', '!=', False),('assemble_status', 'not in', ['0','01'])]}">
-                                            <div>
-                                                <separator string="刀盘:" style="font-size: 13px;"/>
-                                            </div>
-                                            <group>
-                                                <group>
-                                                    <field name="pad_freight_barcode_id" string="货位"
-                                                           attrs="{'readonly': [('assemble_status', 'in', ['1','2'])]}"/>
-                                                    <field name="pad_freight_lot_id" string="批次"
-                                                           attrs="{'invisible': [('assemble_status', 'in', ['1','2'])]}"/>
-                                                    <field name="pad_lot_id" string="批次"
-                                                           attrs="{'invisible': [('assemble_status', 'in', ['0','01'])]}"/>
-                                                    <field name="pad_product_id" string="名称"/>
-                                                    <field name="cutting_tool_cutterpad_model_id" string="型号"/>
-                                                    <field name="pad_specification_id" string="规格"/>
-                                                    <field name="sf_tool_brand_id_4" string="品牌"/>
-                                                </group>
-                                            </group>
-                                            <div>
-                                                <button string="更多" name="set_tool_lot" type="object"
-                                                        class="btn-primary" context="{'tool_type': '刀盘'}"/>
+                                                        class="btn-primary" context="{'tool_type': '刀柄'}"
+                                                        attrs="{'invisible': [('assemble_status', 'not in', ['0','01'])]}"/>
                                             </div>
                                         </group>
                                     </group>
@@ -594,65 +551,102 @@
                                                 <separator string="整体式刀具:" style="font-size: 13px;"/>
                                             </div>
                                             <group>
-                                                <field name="integral_freight_barcode_id" string="货位"
-                                                       attrs="{'readonly': [('assemble_status', 'in', ['1','2'])]}"/>
-                                                <field name="integral_freight_lot_id" string="批次"
-                                                       attrs="{'invisible': [('assemble_status', 'in', ['1','2'])]}"/>
-                                                <field name="integral_lot_id" string="批次"
-                                                       attrs="{'invisible': [('assemble_status', 'in', ['0','01'])]}"/>
-                                                <field name="integral_product_id" string="名称"/>
-                                                <field name="cutting_tool_integral_model_id" string="型号"/>
-                                                <field name="integral_specification_id" string="规格"/>
-                                                <field name="sf_tool_brand_id_1" string="品牌"/>
+                                                <group>
+                                                    <field name="integral_freight_barcode_id" string="货位"/>
+                                                    <field name="integral_lot_id" string="批次"/>
+                                                    <field name="integral_product_id" string="名称"/>
+                                                    <field name="cutting_tool_integral_model_id" string="型号"/>
+                                                    <field name="integral_specification_id" string="规格"/>
+                                                    <field name="sf_tool_brand_id_1" string="品牌"/>
+                                                </group>
+                                                <group>
+                                                    <field name="integral_verify" string="" readonly="1"/>
+                                                </group>
                                             </group>
                                             <div>
                                                 <button string="更多" name="set_tool_lot" type="object"
-                                                        class="btn-primary" context="{'tool_type': '整体式刀具'}"/>
+                                                        class="btn-primary" context="{'tool_type': '整体式刀具'}"
+                                                        attrs="{'invisible': [('assemble_status', 'not in', ['0','01'])]}"/>
                                             </div>
                                         </group>
-                                        <group col="1"
-                                               attrs="{'invisible': [('blade_lot_id', '=', False),'|', ('integral_lot_id', '!=', False),('assemble_status', 'not in', ['0','01'])]}">
-                                            <div>
-                                                <separator string="刀片:" style="font-size: 13px;"/>
-                                            </div>
+
+                                    </group>
+                                </group>
+                                <group attrs="{'invisible': [('assemble_status', '=', '0')]}">
+                                    <group col="1"
+                                           attrs="{'invisible': [('blade_lot_id', '=', False),'|', ('integral_lot_id', '!=', False),('assemble_status', 'not in', ['0','01'])]}">
+                                        <div>
+                                            <separator string="刀片:" style="font-size: 13px;"/>
+                                        </div>
+                                        <group>
                                             <group>
-                                                <field name="blade_freight_barcode_id" string="货位"
-                                                       attrs="{'readonly': [('assemble_status', 'in', ['1','2'])]}"/>
-                                                <field name="blade_freight_lot_id" string="批次"
-                                                       attrs="{'invisible': [('assemble_status', 'in', ['1','2'])]}"/>
-                                                <field name="blade_lot_id" string="批次"
-                                                       attrs="{'invisible': [('assemble_status', 'in', ['0','01'])]}"/>
+                                                <field name="blade_freight_barcode_id" string="货位"/>
+                                                <field name="blade_lot_id" string="批次"/>
                                                 <field name="blade_product_id" string="名称"/>
                                                 <field name="cutting_tool_blade_model_id" string="型号"/>
                                                 <field name="blade_specification_id" string="规格"/>
                                                 <field name="sf_tool_brand_id_2" string="品牌"/>
                                             </group>
+                                            <group>
+                                                <field name="blade_verify" string="" readonly="1"/>
+                                            </group>
+                                        </group>
+                                        <div>
+                                            <button string="更多" name="set_tool_lot" type="object"
+                                                    class="btn-primary" context="{'tool_type': '刀片'}"
+                                                    attrs="{'invisible': [('assemble_status', 'not in', ['0','01'])]}"/>
+                                        </div>
+                                    </group>
+                                    <group col="1">
+                                        <group col="1"
+                                               attrs="{'invisible': [('bar_lot_id', '=', False),'|','|',('integral_lot_id', '!=', False),('pad_lot_id', '!=', False),('assemble_status', 'not in', ['0','01'])]}">
+                                            <div>
+                                                <separator string="刀杆:" style="font-size: 13px;"/>
+                                            </div>
+                                            <group>
+                                                <group>
+                                                    <field name="bar_freight_barcode_id" string="货位"/>
+                                                    <field name="bar_lot_id" string="批次"/>
+                                                    <field name="bar_product_id" string="名称"/>
+                                                    <field name="cutting_tool_cutterbar_model_id" string="型号"/>
+                                                    <field name="bar_specification_id" string="规格"/>
+                                                    <field name="sf_tool_brand_id_3" string="品牌"/>
+                                                </group>
+                                                <group>
+                                                    <field name="bar_verify" string="" readonly="1"/>
+                                                </group>
+                                            </group>
                                             <div>
                                                 <button string="更多" name="set_tool_lot" type="object"
-                                                        class="btn-primary" context="{'tool_type': '刀片'}"/>
+                                                        class="btn-primary" context="{'tool_type': '刀杆'}"
+                                                        attrs="{'invisible': [('assemble_status', 'not in', ['0','01'])]}"/>
+                                            </div>
+                                        </group>
+                                        <group col="1"
+                                               attrs="{'invisible': [('pad_lot_id', '=', False),'|','|',('integral_lot_id', '!=', False),('bar_lot_id', '!=', False),('assemble_status', 'not in', ['0','01'])]}">
+                                            <div>
+                                                <separator string="刀盘:" style="font-size: 13px;"/>
+                                            </div>
+                                            <group>
+                                                <group>
+                                                    <field name="pad_freight_barcode_id" string="货位"/>
+                                                    <field name="pad_lot_id" string="批次"/>
+                                                    <field name="pad_product_id" string="名称"/>
+                                                    <field name="cutting_tool_cutterpad_model_id" string="型号"/>
+                                                    <field name="pad_specification_id" string="规格"/>
+                                                    <field name="sf_tool_brand_id_4" string="品牌"/>
+                                                </group>
+                                                <group>
+                                                    <field name="pad_verify" string="" readonly="1"/>
+                                                </group>
+                                            </group>
+                                            <div>
+                                                <button string="更多" name="set_tool_lot" type="object"
+                                                        class="btn-primary" context="{'tool_type': '刀盘'}"
+                                                        attrs="{'invisible': [('assemble_status', 'not in', ['0','01'])]}"/>
                                             </div>
                                         </group>
                                     </group>
-                                    <!--                                    <group col="1"-->
-                                    <!--                                           attrs="{'invisible': [('assemble_status', 'not in', ['0','01']),('chuck_product_id', '=', False)]}">-->
-                                    <!--                                        <div>-->
-                                    <!--                                            <separator string="夹头:" style="font-size: 13px;"/>-->
-                                    <!--                                        </div>-->
-                                    <!--                                        <group>-->
-                                    <!--                                            <group>-->
-                                    <!--                                                <field name="chuck_freight_barcode_id" string="货位"-->
-                                    <!--                                                       attrs="{'readonly': [('assemble_status', 'in', ['1','2'])]}"/>-->
-                                    <!--                                                <field name="chuck_freight_lot_id" string="批次"-->
-                                    <!--                                                       attrs="{'invisible': [('assemble_status', 'in', ['1','2'])]}"/>-->
-                                    <!--                                                <field name="chuck_lot_id" string="批次"-->
-                                    <!--                                                       attrs="{'invisible': [('assemble_status', 'in', ['0','01'])]}"/>-->
-                                    <!--                                                <field name="chuck_product_id" string="名称"/>-->
-                                    <!--                                                <field name="cutting_tool_cutterhead_model_id" string="型号"/>-->
-                                    <!--                                                <field name="chuck_specification_id" string="规格"/>-->
-                                    <!--                                                <field name="sf_tool_brand_id_6" string="品牌"/>-->
-                                    <!--                                            </group>-->
-                                    <!--                                        </group>-->
-                                    <!--                                    </group>-->
                                 </group>
                                 <group col="1" attrs="{'invisible': [('assemble_status', '=', '0')]}">
                                     <group col="1">