From 5e0b4aa5091d0ccd1a4bb977164c977f36271f5f Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Wed, 13 Mar 2024 17:34:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=A7=E5=93=81=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/models/tool_base_new.py               |   2 +-
 sf_base/models/tool_other_features.py         |   1 +
 sf_base/views/tool_basic_param.xml            | 139 +++++++++++++++---
 sf_base/views/tool_menu.xml                   |   1 +
 sf_base/views/tool_views.xml                  |   9 +-
 .../product_template_management_view.xml      |   9 +-
 sf_manufacturing/models/product_template.py   |   6 +-
 7 files changed, 131 insertions(+), 36 deletions(-)

diff --git a/sf_base/models/tool_base_new.py b/sf_base/models/tool_base_new.py
index 7e87e3df..a3a9e172 100644
--- a/sf_base/models/tool_base_new.py
+++ b/sf_base/models/tool_base_new.py
@@ -126,7 +126,7 @@ class CuttingToolModel(models.Model):
             else:
                 m = int(today_code[-3:]) + 1
                 num = "%03d" % m
-            return "%s%s" % (today_code, num)
+            self.code = "%s%s" % (today_code, num)
 
     # 适用夹头型号可以多选
     # chuck_ids = fields.Many2many(
diff --git a/sf_base/models/tool_other_features.py b/sf_base/models/tool_other_features.py
index ee83735b..e6b80a78 100644
--- a/sf_base/models/tool_other_features.py
+++ b/sf_base/models/tool_other_features.py
@@ -31,6 +31,7 @@ class ToolMaterialsBasicParameters(models.Model):
     blade_depth = fields.Float('刃部深度(mm)')
     pitch = fields.Float('牙距(mm)')
     cutting_depth = fields.Float('切削深度(mm)')
+    cutting_depth_max = fields.Float('最大切削深度(mm)')
     # 刀片参数
     length = fields.Float('长度(mm)')
     thickness = fields.Float('厚度(mm)')
diff --git a/sf_base/views/tool_basic_param.xml b/sf_base/views/tool_basic_param.xml
index f73bf71c..3226df15 100644
--- a/sf_base/views/tool_basic_param.xml
+++ b/sf_base/views/tool_basic_param.xml
@@ -124,52 +124,143 @@
             <field name="arch" type="xml">
                 <form string="规则">
                     <sheet>
-                        <field name="cutting_tool_type"/>
-                        <field name="standard_library_id"/>
+                        <field name="cutting_tool_type" invisible="0"/>
+                        <field name="standard_library_id" invisible="1"/>
                         <group>
                             <group attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}">
                                 <field name="total_length"/>
-                                <field name="blade_number"/>
-                                <field name="neck_diameter"/>
-                                <field name="neck_length"/>
-                                <field name="handle_diameter"/>
-                                <field name="handle_length"/>
-                                <field name="blade_tip_diameter"/>
-                                <field name="blade_tip_working_size"/>
-                                <field name="blade_tip_taper"/>
-                            </group>
-                            <group attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}">
                                 <field name="blade_diameter"/>
                                 <field name="blade_length"/>
+                                <field name="blade_number"/>
+                                <field name="neck_length"/>
+                                <field name="neck_diameter"/>
+                                <field name="handle_diameter"/>
+                                <field name="handle_length"/>
+                            </group>
+                            <group attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}">
+                                <field name="blade_tip_working_size"/>
+                                <field name="blade_tip_diameter"/>
+                                <field name="blade_tip_taper"/>
                                 <field name="blade_helix_angle"/>
-                                <field name="blade_width"/>
-                                <field name="blade_width"/>
                                 <field name="pitch"/>
-                                <field name="cutting_depth"/>
+                                <field name="blade_width"/>
+                                <field name="blade_depth"/>
+                                <field name="cutting_depth_max"/>
                             </group>
                             <group attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}">
-                                <field name="total_length"/>
                                 <field name="length"/>
                                 <field name="thickness"/>
-                                <field name="width"/>
+                                <field name="inscribed_circle_tolerance"/>
+                                <field name="install_aperture_diameter"/>
+                                <field name="blade_tip_circular_arc_radius"/>
                                 <field name="cutting_blade_length"/>
                                 <field name="relief_angle"/>
-                                <field name="blade_tip_circular_arc_radius"/>
-                                <field name="inscribed_circle_diameter"/>
-                                <field name="install_aperture_diameter"/>
                                 <field name="chip_breaker_groove"/>
-                                <field name="blade_teeth_model"/>
-                                <field name="blade_blade_number"/>
+                                <field name="chip_breaker_type_code"/>
                             </group>
                             <group attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}">
+                                <field name="blade_teeth_model"/>
+                                <field name="thread_model"/>
+                                <field name="pitch"/>
+                                <field name="thread_num"/>
+                                <field name="cutting_depth_max"/>
+                                <field name="blade_blade_number" string="刃数"/>
+                                <field name="blade_width" string="刃宽"/>
                                 <field name="main_included_angle"/>
                                 <field name="top_angle"/>
-                                <field name="thread_model"/>
-                                <field name="thread_num"/>
                                 <field name="blade_tip_height_tolerance"/>
                                 <field name="inscribed_circle_tolerance"/>
                                 <field name="thickness_tolerance"/>
                             </group>
+                            <group attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')]}">
+                                <field name="total_length"/>
+                                <field name="width"/>
+                                <field name="height"/>
+                                <field name="knife_head_length"/>
+                                <field name="knife_head_height"/>
+                                <field name="knife_head_width"/>
+                                <field name="blade_diameter"/>
+                                <field name="cutter_arbor_diameter"/>
+                                <field name="is_cooling_hole"/>
+                                <field name="locating_slot_code"/>
+                            </group>
+                            <group attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')]}">
+                                <field name="main_included_angle"/>
+                                <field name="top_angle"/>
+                                <field name="cutting_blade_length"/>
+                                <field name="cutting_depth_max"/>
+                                <field name="min_machining_aperture"/>
+                                <field name="install_blade_tip_num"/>
+                                <field name="installing_structure"/>
+                                <field name="blade_id"/>
+                                <field name="tool_shim"/>
+                                <field name="cotter_pin"/>
+                                <field name="pressing_plate"/>
+                                <field name="screw"/>
+                                <field name="spanner"/>
+                            </group>
+
+                            <group attrs="{'invisible': [('cutting_tool_type', '!=', '刀盘')]}">
+                                <field name="blade_diameter"/>
+                                <field name="cutter_head_diameter"/>
+                                <field name="interface_diameter"/>
+                                <field name="install_blade_tip_num"/>
+                                <field name="total_length"/>
+                                <field name="blade_length"/>
+                                <field name="cutting_blade_length"/>
+                                <field name="cutting_depth"/>
+                                <field name="main_included_angle"/>
+                                <field name="installing_structure"/>
+                            </group>
+                            <group attrs="{'invisible': [('cutting_tool_type', '!=', '刀盘')]}">
+                                <field name="installing_structure"/>
+                                <field name="blade_id"/>
+                                <field name="tool_shim"/>
+                                <field name="screw"/>
+                                <field name="spanner"/>
+                                <field name="is_cooling_hole"/>
+                                <field name="locating_slot_code"/>
+                            </group>
+
+                            <group attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')]}">
+                                <field name="er_size_model"/>
+                                <field name="min_clamping_diameter"/>
+                                <field name="max_clamping_diameter"/>
+                                <field name="total_length"/>
+                                <field name="outer_diameter"/>
+                                <field name="inner_diameter"/>
+                                <field name="taper"/>
+                                <field name="top_diameter"/>
+                                <field name="weight"/>
+                                <field name="max_load_capacity"/>
+                            </group>
+                            <group attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')]}">
+                                <field name="cooling_jacket"/>
+                            </group>
+
+                            <group attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}">
+                                <field name="taper_shank_model"/>
+                                <field name="total_length"/>
+                                <field name="shank_length"/>
+                                <field name="shank_diameter"/>
+                                <field name="flange_shank_length"/>
+                                <field name="flange_diameter"/>
+                                <field name="diameter_slip_accuracy"/>
+                                <field name="dynamic_balance_class"/>
+                                <field name="min_clamping_diameter"/>
+                                <field name="max_clamping_diameter"/>
+                            </group>
+                            <group attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}">
+                                <field name="max_rotate_speed"/>
+                                <field name="fit_chuck_size"/>
+                                <field name="nut"/>
+                                <field name="spanner"/>
+                                <field name="clamping_mode"/>
+                                <field name="tool_changing_time"/>
+                                <field name="cooling_model"/>
+                                <field name="is_quick_cutting"/>
+                                <field name="is_safe_lock"/>
+                            </group>
                         </group>
                     </sheet>
                 </form>
diff --git a/sf_base/views/tool_menu.xml b/sf_base/views/tool_menu.xml
index 82ecca18..506a73df 100644
--- a/sf_base/views/tool_menu.xml
+++ b/sf_base/views/tool_menu.xml
@@ -21,6 +21,7 @@
             <field name="name">刀具标准库</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sf.cutting_tool.standard.library</field>
+<!--            <field name="context">{'default_cutting_tool_material_id': cutting_tool_material_id}</field>-->
             <field name="view_mode">tree,form</field>
         </record>
         <!-- 功能刀具action -->
diff --git a/sf_base/views/tool_views.xml b/sf_base/views/tool_views.xml
index a9604773..aa0e01da 100644
--- a/sf_base/views/tool_views.xml
+++ b/sf_base/views/tool_views.xml
@@ -126,14 +126,14 @@
                                options="{'zoom': true, 'preview_image':'image_128'}" required="1"/>
                         <div class="oe_title">
                             <h1>
-                                <field name="code"/>
+                                <field name="code" readonly="1"/>
                             </h1>
                         </div>
                         <group>
                             <group>
                                 <field name="name"/>
-                                <field name="cutting_tool_material_id"/>
-                                <field name="cutting_tool_type" readonly="1"/>
+                                <field name="cutting_tool_material_id" readonly="1"/>
+                                <field name="cutting_tool_type" invisible="1"/>
                                 <field name="cutting_tool_type_id" required="1"/>
                                 <field name="brand_id" required="1"/>
                                 <label for="integral_run_out_accuracy_min" string="端跳精度"
@@ -165,8 +165,7 @@
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
                             </group>
                             <group>
-                                <field name="material_model_id" placeholder="请选择" string="材质"
-                                       attrs="{'required': [('cutting_tool_type', 'not in', ['刀柄', '夹头'])]}"/>
+                                <field name="material_model_id" placeholder="请选择" string="材质"/>
                                 <field name="tool_hardness" string="硬度(hrc)" options="{'format': false}"
                                        widget="integer"/>
                                 <field name="coating_material"/>
diff --git a/sf_dlm_management/views/product_template_management_view.xml b/sf_dlm_management/views/product_template_management_view.xml
index 9236bead..7ee54524 100644
--- a/sf_dlm_management/views/product_template_management_view.xml
+++ b/sf_dlm_management/views/product_template_management_view.xml
@@ -15,7 +15,7 @@
                            attrs="{'invisible': ['|', '|',('categ_type', '!=', '成品'),('categ_type', '=', False),('is_bfm','=', True)]}"/>
                     <field name="model_file" widget="Viewer3D" string="模型" readonly="1" force_save="1"
                            attrs="{'invisible': ['|','|', ('categ_type', '!=', '成品'),('categ_type', '=', False),('model_file', '=', False)]}"/>
-                    <field name='cutting_tool_type'/>
+                    <field name='cutting_tool_type' invisible="1"/>
                     <field name="fixture_material_type" invisible="1"/>
                     <field name="embryo_model_type_id" string="模型类型" options="{'no_create': True}"
                            attrs="{'invisible': ['|',('categ_type', '!=', '坯料'),('categ_type', '=', False)],'readonly': [('id', '!=', False)]}"/>
@@ -34,9 +34,12 @@
                     <field name="cutting_tool_model_id" placeholder="请选择" class="custom_required"
                            domain="[('cutting_tool_material_id','=',cutting_tool_material_id)]"
                            context="{'default_cutting_tool_material_id': cutting_tool_material_id}"
-                           attrs="{'invisible': [('categ_type', '!=', '刀具')],'required': [('categ_type', '=', '刀具')],'readonly': [('id', '!=', False)]}"/>
+                           attrs="{'invisible': [('categ_type', '!=', '刀具')],'required': [('categ_type', '=', '刀具')],'readonly': [('id', '!=', False)]}">
+                    </field>
+                    <!--                                        <button name="%(sf_base.action_sf_cutting_tool_standard_library)d" string="新建" type="action"-->
+                    <!--                                                context="{'default_cutting_tool_material_id': cutting_tool_material_id}"/>-->
                     <field name="specification_id" placeholder="请选择" class="custom_required"
-                           context="{'default_cutting_tool_type': cutting_tool_type}"
+                           context="{'default_cutting_tool_type': cutting_tool_type,'default_standard_library_id':cutting_tool_model_id}"
                            attrs="{'invisible': [('categ_type', '!=', '刀具')],'required': [('categ_type', '=', '刀具')],'readonly': [('id', '!=', False)]}"
                            domain="[('standard_library_id','=',cutting_tool_model_id)]"/>
                     <field name="fixture_material_id" attrs="{'invisible': [('categ_type', '!=', '夹具')]}"
diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index a3ef602c..862e6c8f 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -103,9 +103,9 @@ class ResProductMo(models.Model):
     compaction_way_id = fields.Many2one('maintenance.equipment.image',
                                         '压紧方式', domain=[('type', '=', '压紧方式')])
 
-    @api.onchange('cutting_tool_model_id')
-    def _onchange_cutting_tool_model_id(self):
-        self.specification_id = False
+    # @api.onchange('cutting_tool_model_id')
+    # def _onchange_cutting_tool_model_id(self):
+    #     self.specification_id = False
 
     @api.onchange('cutting_tool_material_id')
     def _onchange_cutting_tool_material_id(self):