From 3225916629424c1170a565507d11e8880038576b Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Thu, 7 Sep 2023 17:46:22 +0800
Subject: [PATCH 1/3] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=9A=20=E2=91=A0=E2=80=9C=E4=BA=A7?=
 =?UTF-8?q?=E5=93=81=E7=B1=BB=E5=88=AB=E2=80=9D=E5=AD=97=E6=AE=B5=E6=94=BE?=
 =?UTF-8?q?=E5=9C=A8=E5=BC=80=E7=A5=A8=E7=AD=96=E7=95=A5=E5=90=8E=E9=9D=A2?=
 =?UTF-8?q?=EF=BC=9B=E2=80=9C=E5=86=85=E9=83=A8=E7=BC=96=E7=A0=81=E2=80=9D?=
 =?UTF-8?q?=E5=92=8C=E2=80=9C=E6=9D=A1=E7=A0=81=E2=80=9D=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=94=BE=E5=9C=A8=E4=BA=A7=E5=93=81=E6=A0=87=E7=AD=BE=E5=90=8E?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=9B=E5=BD=93=E2=80=9C=E4=BA=A7=E5=93=81=E7=B1=BB?=
 =?UTF-8?q?=E5=88=AB=E2=80=9D=E4=B8=BA=E2=80=9C=E6=88=90=E5=93=81=E2=80=9D?=
 =?UTF-8?q?=E6=97=B6=E2=80=9C=E4=B8=8A=E4=BC=A0=E6=A8=A1=E5=9E=8B=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E2=80=9C=E5=92=8C=E2=80=9C=E6=A8=A1=E5=9E=8B=E2=80=9C?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=94=BE=E5=9C=A8"=E9=94=80=E5=94=AE?=
 =?UTF-8?q?=E4=BB=B7=E6=A0=BC"=E5=89=8D=E9=9D=A2=EF=BC=9B=20=E2=91=A1?=
 =?UTF-8?q?=E5=BD=93=E2=80=9C=E4=BA=A7=E5=93=81=E7=B1=BB=E5=88=AB=E2=80=9D?=
 =?UTF-8?q?=E4=B8=BA=E2=80=9C=E5=88=80=E5=85=B7=E2=80=9D=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=94=E2=80=9C=E5=88=80=E5=85=B7=E7=89=A9=E6=96=99=E2=80=9D?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=B8=BA=E2=80=9C=E6=95=B4=E4=BD=93=E5=BC=8F?=
 =?UTF-8?q?=E5=88=80=E5=85=B7=E2=80=9D,"=E5=88=80=E6=9F=84"=E6=88=96"?=
 =?UTF-8?q?=E5=A4=B9=E5=A4=B4"=E6=97=B6=EF=BC=8C=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E9=80=89=E6=8B=A9=E7=9A=84=E5=88=80=E5=85=B7?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E8=80=8C=E6=96=B0=E5=A2=9E=E6=89=80=E5=AF=B9?=
 =?UTF-8?q?=E5=BA=94=E9=9C=80=E8=A6=81=E7=9A=84=E5=AD=97=E6=AE=B5=E5=8F=8A?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=B8=83=E5=B1=80=E5=B1=95=E7=A4=BA=202.?=
 =?UTF-8?q?=E9=87=87=E8=B4=AD=E4=BA=A7=E5=93=81=E6=97=B6=EF=BC=8C=E4=BA=A7?=
 =?UTF-8?q?=E5=93=81=E7=9A=84=E2=80=9C=E4=BA=A7=E5=93=81=E7=B1=BB=E5=88=AB?=
 =?UTF-8?q?=E2=80=9D=E4=B8=BA=E2=80=9D=E5=88=80=E5=85=B7=E2=80=9C=E4=B8=94?=
 =?UTF-8?q?=E2=80=9C=E5=88=80=E5=85=B7=E7=89=A9=E6=96=99=E2=80=9D=E4=B8=BA?=
 =?UTF-8?q?=E2=80=9C=E6=95=B4=E4=BD=93=E5=BC=8F=E5=88=80=E5=85=B7=E2=80=9D?=
 =?UTF-8?q?,"=E5=88=80=E6=9F=84"=E6=88=96"=E5=A4=B9=E5=A4=B4"=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=9C=A8=E6=94=B6=E8=B4=A7=E5=8D=95=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81=E6=93=8D=E4=BD=9C=E6=97=B6=EF=BC=8C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=AE=9E=E6=97=B6=E6=B3=A8=E5=86=8C=E5=88=B0Cloud?=
 =?UTF-8?q?=E7=9A=84=E5=8A=A8=E6=80=81=E8=B5=84=E6=BA=90=E9=87=8C=E7=9A=84?=
 =?UTF-8?q?=E5=B7=A5=E5=8E=82=E5=88=80=E5=85=B7=E7=89=A9=E6=96=99=E7=9A=84?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=203.=E4=BC=98=E5=8C=96=E2=80=9C=E4=BA=A7?=
 =?UTF-8?q?=E5=93=81=E6=A8=A1=E6=9D=BF"=E6=A8=A1=E5=9E=8B=E7=9A=84?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/static/src/scss/test.scss           |  15 +
 sf_dlm/views/product_template_view.xml      | 310 ++++++++++----
 sf_manufacturing/models/product_template.py | 440 +++++++++++---------
 sf_manufacturing/models/stock.py            |  59 ++-
 4 files changed, 515 insertions(+), 309 deletions(-)

diff --git a/sf_base/static/src/scss/test.scss b/sf_base/static/src/scss/test.scss
index 39c5250f..a54eb808 100644
--- a/sf_base/static/src/scss/test.scss
+++ b/sf_base/static/src/scss/test.scss
@@ -146,4 +146,19 @@ td.o_required_modifier {
   display: flex;
   flex-direction: row-reverse;
   justify-content: flex-start;
+}
+
+.diameter:before {
+  content:"Ф";
+  display:inline;
+}
+.diameter{
+  display: flex !important;
+  justify-content: flex-start !important;
+  align-items: center !important;
+}
+.o_address_format {
+  display: flex !important;
+  justify-content: flex-start !important;
+  align-items: center !important;
 }
\ No newline at end of file
diff --git a/sf_dlm/views/product_template_view.xml b/sf_dlm/views/product_template_view.xml
index c7622563..5c858f9a 100644
--- a/sf_dlm/views/product_template_view.xml
+++ b/sf_dlm/views/product_template_view.xml
@@ -1,47 +1,68 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
     <data>
+        <record model="ir.ui.view" id="view_product_template_only_form_inherit_sf">
+            <field name="name">product.template.only.form.inherit.sf</field>
+            <field name="model">product.template</field>
+            <field name="inherit_id" ref="product.product_template_only_form_view"/>
+            <field name="arch" type="xml">
+                <field name="barcode" position="replace">
+                    <field name='barcode' invisible="1"/>
+                </field>
+                <field name="default_code" position="replace">
+                    <field name='default_code' invisible="1"/>
+                </field>
+            </field>
+        </record>
+
         <record model="ir.ui.view" id="view_product_template_form_inherit_sf">
             <field name="name">product.template.form.inherit.sf</field>
             <field name="model">product.template</field>
             <field name="inherit_id" ref="sale.product_template_form_view"/>
             <field name="arch" type="xml">
-                <field name="list_price" position="before">
+                <xpath expr="//label[@for='list_price']" position="before">
                     <field name='categ_type' invisible="1"/>
                     <field name="upload_model_file"
                            widget="many2many_binary"
                            attrs="{'invisible': ['|', ('categ_type', '!=', '成品'),('categ_type', '=', False)]}"/>
                     <field name="model_file" widget="Viewer3D" string="模型" readonly="1" force_save="1"
                            attrs="{'invisible': ['|','|', ('categ_type', '!=', '成品'),('categ_type', '=', False),('model_file', '=', False)]}"/>
+                </xpath>
+                <field name="categ_id" position="replace">
+                    <field name='categ_id' invisible="1"/>
+                </field>
+                <field name="product_tag_ids" position="after">
+                    <field name="default_code" attrs="{'invisible': [('product_variant_count', '&gt;', 1)]}"/>
+                    <field name="barcode" attrs="{'invisible': [('product_variant_count', '&gt;', 1)]}"/>
                 </field>
                 <field name="invoice_policy" position="after">
-<!--                    <field name='categ_id'/>-->
+                    <field name='categ_id'/>
                     <field name='cutting_tool_type' invisible="1"/>
                     <field name="fixture_material_type" invisible="1"/>
                     <field name="embryo_model_type_id" string="模型类型"
                            attrs="{'invisible': ['|',('categ_type', '!=', '坯料'),('categ_type', '=', False)]}"/>
-                    <field name="materials_id" string="材料"
+                    <field name="materials_id" string="材料" placeholder="请选择"
                            attrs="{'invisible': [('categ_type', 'not in', ['成品','坯料', '原材料'])]}"/>
-                    <field name="materials_type_id" string="型号"
+                    <field name="materials_type_id" string="型号" placeholder="请选择"
                            domain="[('materials_id', '=', materials_id)]"
                            attrs="{'invisible': [('categ_type', 'not in', ['成品','坯料', '原材料'])]}"/>
                     <field name="server_product_process_parameters_id" string="表面工艺参数"
                            options="{'no_create': True}"
                            attrs="{'invisible': ['|',('categ_type', '!=', '表面工艺'),('categ_type', '=', False)]}"/>
-                    <field name="cutting_tool_material_id" attrs="{'invisible': [('categ_type', '!=', '刀具')]}"/>
-                    <field name="cutting_tool_model_id"
+                    <field name="cutting_tool_material_id" attrs="{'invisible': [('categ_type', '!=', '刀具')]}"
+                           placeholder="请选择"/>
+                    <field name="cutting_tool_model_id" placeholder="请选择"
                            context="{'default_cutting_tool_material_id': cutting_tool_material_id,'default_cutting_tool_type_id': cutting_tool_type_id}"
                            attrs="{'invisible': [('categ_type', '!=', '刀具')]}"
                            domain="[('cutting_tool_material_id','=',cutting_tool_material_id)]"/>
-                    <field name="fixture_material_id" attrs="{'invisible': [('categ_type', '!=', '夹具')]}"/>
-                    <field name="fixture_model_id" string="型号"
+                    <field name="fixture_material_id" attrs="{'invisible': [('categ_type', '!=', '夹具')]}"
+                           placeholder="请选择"/>
+                    <field name="fixture_model_id" string="型号" placeholder="请选择"
                            context="{'default_fixture_material_id': fixture_material_id,'default_multi_mounting_type_id': fixture_multi_mounting_type_id}"
                            attrs="{'invisible': [('categ_type', '!=', '夹具')]}"
                            domain="[('fixture_material_id','=',fixture_material_id)]"/>
                 </field>
-<!--                <field name="categ_id" position="replace">-->
-<!--                    <field name='categ_id' invisible="1"/>-->
-<!--                </field>-->
+
                 <xpath expr="//label[@for='volume']" position="before">
                     <label for="length" string="尺寸"
                            attrs="{'invisible':[('product_variant_count', '>', 1), ('is_product_variant', '=', False)]}"/>
@@ -85,19 +106,44 @@
                     <page string="刀具物料参数" attrs="{'invisible': [('categ_type', '!=', '刀具')]}">
                         <group>
                             <group attrs="{'invisible': [('categ_type', '!=', '刀具')]}" col="1">
-                                <field name="brand_id" options="{'no_create': True}"/>
-                                <field name="cutting_tool_type_id" options="{'no_create': True}"/>
-                                <field name="materials_type_id" options="{'no_create': True}"/>
+                                <field name="cutting_tool_type_id" options="{'no_create': True}" placeholder="请选择"/>
+                                <field name="brand_id" options="{'no_create': True}" placeholder="请选择"/>
+                                <field name="materials_type_id" options="{'no_create': True}"
+                                       attrs="{'invisible': [('cutting_tool_type', 'in', ('整体式刀具','夹头','刀柄'))]}"
+                                       placeholder="请选择"/>
                                 <field name="cutting_tool_total_length"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀柄'))]}"/>
-                                <field name="cutting_tool_shank_length"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀柄','夹头'))]}"/>
+
+                                <field name="cutting_tool_flange_length"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
+
+                                <field name="materials_type_id" options="{'no_create': True}" string="刀具材质"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"
+                                       placeholder="请选择"/>
+                                <field name="tool_hardness" string="刀具硬度(hrc)"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
+                                <field name="materials_type_id" options="{'no_create': True}" string="夹头材质"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')]}"
+                                       placeholder="请选择"/>
+                                <field name="tool_hardness" string="夹头硬度(hrc)"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')]}"/>
+                                <field name="materials_type_id" options="{'no_create': True}" string="刀柄材质"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"
+                                       placeholder="请选择"/>
+                                <field name="tool_hardness" string="刀柄硬度(hrc)"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
+
                                 <field name="cutting_tool_blade_length"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
-                                <field name="integral_neck_length" string="颈部长度(mm)"
+                                <field name="cutting_tool_blade_diameter" string="刃部直径(mm)" class="diameter"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
-                                <field name="integral_blade_type" string="刃部类型"
+                                <field name="cutting_tool_blade_type"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
+                                <field name="cutting_tool_blade_helix_angle"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
+                                <field name="cutting_tool_blade_number" placeholder="请选择"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
+
 
                                 <!--刀片-->
                                 <label for="tool_length" string="尺寸(mm)"
@@ -114,63 +160,108 @@
                                     <field name="tool_thickness" class="o_address_zip"
                                            options="{'format': false}"/>
                                 </div>
-                                <field name="cutting_tool_diameter"
+                                <field name="cutting_tool_diameter" class="diameter"
                                        attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片','刀杆','刀盘'))]}"/>
-                                <field name="cutting_tool_blade_diameter"
+                                <field name="cutting_tool_blade_diameter" class="diameter" string="刃径"
                                        attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))]}"/>
                                 <field name="cutting_tool_blade_number"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片','刀杆','刀盘'))]}"/>
-                                <field name="cutting_tool_diameter_max"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
-                                <field name="cutting_tool_flange_length"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
-                                <field name="cutting_tool_flange_diameter"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片','刀杆','刀盘'))]}"/>
                                 <!--夹头-->
-                                <field name="cutting_tool_outer_diameter"
+
+                                <field name="cutting_tool_clamping_way"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
+                                <field name="cutting_tool_clamping_length"
                                        attrs='{"invisible": [("cutting_tool_type","!=","夹头")]}'/>
-                                <field name="cutting_tool_inner_diameter"
+                                <field name="cutting_tool_clamping_tolerance"
                                        attrs='{"invisible": [("cutting_tool_type","!=","夹头")]}'/>
-                                <field name="tool_height" attrs='{"invisible": [("cutting_tool_type","!=","夹头")]}'/>
-                                <field name="tool_weight"
+                                <label for="cutting_tool_clamping_diameter_min" string="夹持直径"
                                        attrs='{"invisible": [("cutting_tool_type","not in",("夹头","刀柄"))]}'/>
-                                <field name="cutting_tool_clamping_diameter"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('夹头','刀柄'))]}"/>
-                                <field name="cutting_tool_cutter_bar_ids" widget="many2many_tags"
-                                       options="{'no_create': True}"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}"/>
-                                <field name="cutting_tool_cutter_pad_ids" widget="many2many_tags"
-                                       options="{'no_create': True}"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}"/>
-                                <field name="cutting_tool_blade_ids" widget="many2many_tags"
-                                       options="{'no_create': True}"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))]}"/>
-                                <field name="cutting_tool_chuck_ids" widget="many2many_tags"
-                                       options="{'no_create': True}"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘','刀柄'))]}"/>
-                                <field name="cutting_tool_handle_ids" widget="many2many_tags"
-                                       options="{'no_create': True}"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('夹头'))]}"/>
+                                <div class="o_address_format"
+                                     attrs='{"invisible": [("cutting_tool_type","not in",("夹头","刀柄"))]}'>
+                                    <label for="cutting_tool_clamping_diameter_min" string="最小"/>
+                                    <field name="cutting_tool_clamping_diameter_min" class="o_address_zip diameter"
+                                           options="{'format': false}"
+                                           attrs="{'required': [('cutting_tool_type','not in',('夹头','刀柄'))]}"/>
+                                    <span>(mm)&amp;nbsp;</span>
+                                    <label for="cutting_tool_clamping_diameter_max" string="最大"/>
+                                    <field name="cutting_tool_clamping_diameter_max" class="o_address_zip diameter"
+                                           options="{'format': false}"
+                                           attrs="{'required': [('cutting_tool_type','not in',('夹头','刀柄'))]}"/>
+                                    <span>(mm)&amp;nbsp;</span>
+                                </div>
+                                <field name="cutting_tool_head_diameter" class="diameter"
+                                       attrs='{"invisible": [("cutting_tool_type","!=","夹头")]}'/>
+                                <field name="cutting_tool_outer_diameter" class="diameter"
+                                       attrs='{"invisible": [("cutting_tool_type","!=","夹头")]}'/>
+                                <field name="cutting_tool_inner_diameter" class="diameter"
+                                       attrs='{"invisible": [("cutting_tool_type","!=","夹头")]}'/>
+
+                                <field name="cutting_tool_standard_speed"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
+                                <field name="cutting_tool_speed_max"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
+                                <field name="cutting_tool_change_time"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
+                                <field name="cutting_tool_cooling_type"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
+                                <field name="cutting_tool_dynamic_balance_class"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
                             </group>
                             <group attrs="{'invisible': [('categ_type', '!=', '刀具')]}">
                                 <!--整体式刀具-->
-                                <field name="integral_hardness" string="刀具硬度(HRC)"
+                                <field name="cutting_tool_shank_length"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
-                                <field name="integral_coarse_medium_fine" string="粗/中/精"
-                                       attrs="{'required': [('cutting_tool_type','=','整体式刀具')],'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
-                                <field name="integral_shank_diameter" string="柄部直径(mm)"
-                                attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
-                                <field name="integral_blade_diameter" string="刃部直径(mm)"
-                                attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
-                                <field name="integral_neck_diameter" string="颈部直径(mm)"
-                                attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
-                                <field name="integral_blade_tip_diameter" string="刀尖直径(mm)"
-                                attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
-                                <field name="integral_blade_helix_angle" string="刃部螺旋角(°)"
+                                <field name="cutting_tool_shank_diameter" string="柄部直径(mm)" class="diameter"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
-                                <field name="integral_blade_tip_taper" string="刀尖锥度(°)"
+                                <field name="cutting_tool_neck_length" string="颈部长度(mm)"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
+                                <field name="cutting_tool_neck_diameter" string="颈部直径(mm)" class="diameter"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
+                                <field name="cutting_tool_blade_tip_diameter" string="刀尖直径(mm)" class="diameter"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
+                                <field name="cutting_tool_blade_tip_taper" string="刀尖锥度(°)"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
 
+                                <label for="cutting_tool_run_out_accuracy_min" string="端跳精度"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
+                                <div class="o_address_format"
+                                     attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}">
+                                    <label for="cutting_tool_run_out_accuracy_min" string="最小"/>
+                                    <field name="cutting_tool_run_out_accuracy_min" class="o_address_zip"
+                                           options="{'format': false}"
+                                           attrs="{'invisible': [('cutting_tool_type','!=','整体式刀具')]}"/>
+                                    <span>(mm)&amp;nbsp;</span>
+                                    <label for="cutting_tool_run_out_accuracy_max" string="最大"/>
+                                    <field name="cutting_tool_run_out_accuracy_max" class="o_address_zip"
+                                           options="{'format': false}"
+                                           attrs="{'invisible': [('cutting_tool_type','!=','整体式刀具')]}"/>
+                                    <span>(mm)&amp;nbsp;</span>
+                                </div>
+                                <field name="cutting_tool_coarse_medium_fine" string="粗/中/精" placeholder="请选择"
+                                       attrs="{'required': [('cutting_tool_type','=','整体式刀具')],'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
+
+                                <field name="tool_weight"
+                                       attrs='{"invisible": [("cutting_tool_type","not in",("夹头","刀柄"))]}'/>
+                                <field name="cutting_tool_taper"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('夹头','刀柄'))]}"/>
+
+                                <label for="cutting_tool_detection_accuracy_min" string="检测精度"
+                                       attrs='{"invisible": [("cutting_tool_type","not in",("刀柄"))]}'/>
+                                <div class="o_address_format"
+                                     attrs='{"invisible": [("cutting_tool_type","not in",("刀柄"))]}'>
+                                    <label for="cutting_tool_detection_accuracy_min" string="最小"/>
+                                    <field name="cutting_tool_detection_accuracy_min" class="o_address_zip"
+                                           options="{'format': false}"
+                                           attrs="{'required': [('cutting_tool_type','=','刀柄')]}"/>
+                                    <span>(mm)&amp;nbsp;</span>
+                                    <label for="cutting_tool_detection_accuracy_max" string="最大"/>
+                                    <field name="cutting_tool_detection_accuracy_max" class="o_address_zip"
+                                           options="{'format': false}"
+                                           attrs="{'required': [('cutting_tool_type','=','刀柄')]}"/>
+                                    <span>(mm)&amp;nbsp;</span>
+                                </div>
+                                <field name="cutting_tool_body_accuracy"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
                                 <field name="cutting_tool_jump_accuracy"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
                                 <field name="cutting_tool_front_angle"
@@ -182,48 +273,91 @@
                                 <field name="cutting_tool_main_included_angle"
                                        attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}"/>
                                 <field name="coating_material"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片','刀柄'))]}"/>
                                 <field name="cutting_tool_accuracy_level"
-                                       attrs="{'invisible': [('cutting_tool_type', 'in', ('刀柄', '整体式刀具'))]}"/>
-                                <field name="cutting_tool_working_hardness" attrs="{'invisible': [('cutting_tool_type', '=', '整体式刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', 'in', ('刀柄', '整体式刀具','夹头'))]}"/>
+                                <field name="cutting_tool_working_hardness"
+                                       attrs="{'invisible': [('cutting_tool_type', 'in', ('整体式刀具','夹头','刀柄'))]}"/>
+
+                                <!--                                <field name="tool_height" attrs='{"invisible": [("cutting_tool_type","!=","夹头")]}'/>-->
+
+
+                                <field name="cutting_tool_is_rough_finish"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
+                                <field name="cutting_tool_is_finish"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
+                                <field name="cutting_tool_is_drill_hole"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
+                                <field name="cutting_tool_is_high_speed_cutting"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
+                                <field name="cutting_tool_is_safety_lock" string="有无安全锁"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
+
+
+                                <field name="cutting_tool_jump_accuracy" string="跳动精度(mm)"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')]}"/>
+                                <field name="coating_material"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')]}"/>
+                                <field name="cutting_tool_er_size_model"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')]}"/>
+                                <field name="cutting_tool_handle_ids" widget="many2many_tags"
+                                       options="{'no_create': True}"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')]}"/>
+                                <field name="cooling_suit_type_ids"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')]}"/>
+
                                 <field name="cutting_tool_wrench"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('夹头','刀柄','刀杆','刀盘' ))]}"/>
-                                <field name="cutting_tool_screw"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('夹头','刀柄'))]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘' ))]}"/>
+                                <!--                                <field name="cutting_tool_screw"-->
+                                <!--                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀柄'))]}"/>-->
                                 <field name="cutting_tool_nut"
                                        attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}"/>
+
+                                <field name="cutting_tool_cutter_bar_ids" widget="many2many_tags"
+                                       options="{'no_create': True}"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}"/>
+                                <field name="cutting_tool_cutter_pad_ids" widget="many2many_tags"
+                                       options="{'no_create': True}"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}"/>
+                                <field name="cutting_tool_blade_ids" widget="many2many_tags"
+                                       options="{'no_create': True}"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))]}"/>
+
+                                <field name="cutting_tool_chuck_ids" widget="many2many_tags"
+                                       options="{'no_create': True}"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘','刀柄'))]}"/>
+                                <field name="apply_lock_nut_model"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
+                                <field name="apply_lock_wrench_model"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
+
+
                             </group>
                         </group>
                         <group col="1" attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}">
                             <group>
                                 <group>
-                                    <label for="integral_run_out_accuracy_min" string="端跳精度:"/>
-                                        <div class="test_model">
-                                            <label for="integral_run_out_accuracy_min" string="最小(min)"/>
-                                            <field name="integral_run_out_accuracy_min" class="o_address_zip" required="1"
-                                                   options="{'format': false}" attrs="{'required': [('cutting_tool_type','=','整体式刀具')]}"/>
-                                            <span>(mm)&amp;nbsp;</span>
-                                            <label for="integral_run_out_accuracy_max" string="最大(max)"/>
-                                            <field name="integral_run_out_accuracy_max" class="o_address_zip" required="1"
-                                                   options="{'format': false}" attrs="{'required': [('cutting_tool_type','=','整体式刀具')]}"/>
-                                            <span>(mm)&amp;nbsp;</span>
-                                        </div>
+
                                 </group>
                             </group>
                             <group string="适合加工方式">
                                 <field name="suitable_machining_method_ids" string=""/>
                             </group>
-                            <group string="刀尖特征">
-                                <field name="blade_tip_characteristics_ids" string=""/>
+                            <group>
+                                <group string="刀尖特征">
+                                    <field name="blade_tip_characteristics_ids" string=""/>
+                                </group>
+                                <group string="柄部类型">
+                                    <field name="handle_type_ids" string=""/>
+                                </group>
                             </group>
-                            <group string="柄部类型">
-                                <field name="handle_type_ids" string=""/>
-                            </group>
-                            <group string="走刀方向">
-                                <field name="cutting_direction_ids" string=""/>
-                            </group>
-                            <group string="适合冷却液">
-                                <field name="suitable_coolant_ids" string=""/>
+                            <group>
+                                <group string="走刀方向">
+                                    <field name="cutting_direction_ids" string=""/>
+                                </group>
+                                <group string="适合冷却液">
+                                    <field name="suitable_coolant_ids" string=""/>
+                                </group>
                             </group>
                         </group>
                     </page>
diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index 2a91f7f1..e6b7c1a9 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -25,7 +25,6 @@ class ResProductMo(models.Model):
     #         if record:
     #             record.categ_type = record.categ_id.type
 
-
     categ_type = fields.Selection(string='产品的类别', related='categ_id.type', store=True)
 
     model_name = fields.Char('模型名称')
@@ -63,7 +62,7 @@ class ResProductMo(models.Model):
 
     cutting_tool_model_id = fields.Many2one('sf.cutting.tool.model', string='型号',
                                             )
-    cutting_tool_type_id = fields.Many2one('sf.cutting.tool.type', string='刀具类型',
+    cutting_tool_type_id = fields.Many2one('sf.cutting.tool.type', string='类型',
                                            domain="[('cutting_tool_material_id.name', '=', cutting_tool_type)]")
 
     brand_id = fields.Many2one('sf.machine.brand', '品牌')
@@ -72,107 +71,109 @@ class ResProductMo(models.Model):
     tool_height = fields.Integer('高度(mm)')
     tool_thickness = fields.Integer('厚度(mm)')
     tool_weight = fields.Float('重量(kg)')
+    tool_hardness = fields.Integer('硬度(hrc)')
 
     coating_material = fields.Char('涂层材质')
     # 整体式刀具特有字段
     cutting_tool_total_length = fields.Float('总长度(mm)', digits=(6, 1))
     cutting_tool_shank_length = fields.Float('柄部长度(mm)', digits=(6, 1))
     cutting_tool_blade_length = fields.Float('刃部长度(mm)', digits=(6, 1))
-    cutting_tool_blade_number = fields.Integer('刃数(个)')
+    cutting_tool_blade_number = fields.Selection(
+        [('2', '2'), ('3', '3'), ('4', '4'), ('5', '5'), ('6', '6'), ('7', '7'), ('8', '8')], '刃数(个)')
     # 整体式刀具新增字段
-    integral_neck_length = fields.Float('整体式刀具颈部长度(mm)', digits=(6, 1))
-    integral_shank_diameter = fields.Float('整体式刀具柄部直径(mm)', digits=(6, 1))
-    integral_blade_diameter = fields.Float('整体式刀具刃部直径(mm)', digits=(6, 1))
-    integral_neck_diameter = fields.Float('整体式刀具颈部直径(mm)', digits=(6, 1))
-    integral_blade_tip_diameter = fields.Float('整体式刀具刀尖直径(mm)', digits=(6, 1))
-    integral_blade_tip_taper = fields.Float('整体式刀具刀尖锥度(°)', digits=(6, 1))
-    integral_blade_helix_angle = fields.Float('整体式刀具刃部螺旋角(°)', digits=(6, 1))
-    integral_blade_type = fields.Char('整体式刀具刃部类型')
-    integral_coarse_medium_fine = fields.Selection([('粗', '粗'), ('中', '中'), ('精', '精')], '整体式刀具粗/中/精')
-    integral_hardness = fields.Integer('整体式刀具硬度(HRC)')
-    integral_run_out_accuracy_max = fields.Float('整体式刀具端跳精度max', digits=(6, 1))
-    integral_run_out_accuracy_min = fields.Float('整体式刀具端跳精度min', digits=(6, 1))
+    cutting_tool_neck_length = fields.Float('颈部长度(mm)', digits=(6, 1))
+    cutting_tool_neck_diameter = fields.Float('颈部直径(mm)', digits=(6, 1))
+    cutting_tool_shank_diameter = fields.Float('柄部直径(mm)', digits=(6, 1))
+    cutting_tool_blade_tip_diameter = fields.Float('刀尖直径(mm)', digits=(6, 1))
+    cutting_tool_blade_tip_taper = fields.Float('刀尖锥度(°)', digits=(6, 1))
+    cutting_tool_blade_helix_angle = fields.Char('刃部螺旋角(°)')
+    cutting_tool_blade_type = fields.Char('刃部类型')
+    cutting_tool_coarse_medium_fine = fields.Selection([('粗', '粗'), ('中', '中'), ('精', '精')], '粗/中/精')
+    cutting_tool_run_out_accuracy_max = fields.Float('端跳精度max', digits=(6, 1))
+    cutting_tool_run_out_accuracy_min = fields.Float('端跳精度min', digits=(6, 1))
     suitable_machining_method_ids = fields.Many2many('sf.suitable.machining.method',
                                                      'rel_suitable_machining_method_product_template', '适合加工方式')
     blade_tip_characteristics_ids = fields.Many2many('sf.blade.tip.characteristics',
                                                      'rel_blade_tip_characteristics_product_template', '刀尖特征')
     handle_type_ids = fields.Many2many('sf.handle.type', 'rel_handle_type_product_template', '柄部类型')
-    cutting_direction_ids = fields.Many2many('sf.cutting.direction', 'rel_cutting_direction_product_template', '走刀方向')
-    suitable_coolant_ids = fields.Many2many('sf.suitable.coolant', 'rel_suitable_coolant_product_template', '适合冷却液')
+    cutting_direction_ids = fields.Many2many('sf.cutting.direction', 'rel_cutting_direction_product_template',
+                                             '走刀方向')
+    suitable_coolant_ids = fields.Many2many('sf.suitable.coolant', 'rel_suitable_coolant_product_template',
+                                            '适合冷却液')
 
-    @api.constrains('suitable_machining_method_ids')
-    def _check_suitable_machining_method_ids(self):
-        for record in self:
-            if len(record.suitable_machining_method_ids) == 0 and self.cutting_tool_type == '整体式刀具':
-                raise ValidationError("适合加工方式不能为空!")
+    # @api.constrains('suitable_machining_method_ids')
+    # def _check_suitable_machining_method_ids(self):
+    #     for record in self:
+    #         if len(record.suitable_machining_method_ids) == 0 and self.cutting_tool_type == '整体式刀具':
+    #             raise ValidationError("适合加工方式不能为空!")
+    #
+    # @api.constrains('blade_tip_characteristics_ids')
+    # def _check_blade_tip_characteristics_ids(self):
+    #     for record in self:
+    #         if len(record.blade_tip_characteristics_ids) == 0 and self.cutting_tool_type == '整体式刀具':
+    #             raise ValidationError("刀尖特征不能为空!")
+    #         if len(record.blade_tip_characteristics_ids) > 1 and self.cutting_tool_type == '整体式刀具':
+    #             raise ValidationError("刀尖特征只能单选!")
+    #
+    # @api.constrains('handle_type_ids')
+    # def _check_handle_type_ids(self):
+    #     for record in self:
+    #         if len(record.handle_type_ids) == 0 and self.cutting_tool_type == '整体式刀具':
+    #             raise ValidationError("柄部类型不能为空!")
+    #         if len(record.handle_type_ids) > 1 and self.cutting_tool_type == '整体式刀具':
+    #             raise ValidationError("柄部类型只能单选!")
+    #
+    # @api.constrains('cutting_direction_ids')
+    # def _check_cutting_direction_ids(self):
+    #     for record in self:
+    #         if len(record.cutting_direction_ids) == 0 and self.cutting_tool_type == '整体式刀具':
+    #             raise ValidationError("走刀方向不能为空!")
+    #
+    # @api.constrains('suitable_coolant_ids')
+    # def _check_suitable_coolant_ids(self):
+    #     for record in self:
+    #         if not record.suitable_coolant_ids and self.cutting_tool_type == '整体式刀具':
+    #             raise ValidationError("适合冷却液不能为空!")
+    #
+    # @api.constrains('cutting_tool_total_length')
+    # def _check_cutting_tool_total_length(self):
+    #     if self.cutting_tool_total_length <= 0 and self.cutting_tool_type == '整体式刀具':
+    #         raise ValidationError("总长度不能为0")
+    #
+    # @api.constrains('cutting_tool_shank_length')
+    # def _check_cutting_tool_shank_length(self):
+    #     if self.cutting_tool_shank_length <= 0 and self.cutting_tool_type == '整体式刀具':
+    #         raise ValidationError("柄部长度不能为0")
+    #
+    # @api.constrains('cutting_tool_blade_length')
+    # def _check_cutting_tool_blade_length(self):
+    #     if self.cutting_tool_blade_length <= 0 and self.cutting_tool_type == '整体式刀具':
+    #         raise ValidationError("刃部长度不能为0")
+    #
+    # @api.constrains('cutting_tool_blade_number')
+    # def _check_cutting_tool_blade_number(self):
+    #     if self.cutting_tool_blade_number <= 0 and self.cutting_tool_type == '整体式刀具':
+    #         raise ValidationError("刃数不能为0")
+    #
+    # @api.constrains('integral_shank_diameter')
+    # def _check_integral_shank_diameter(self):
+    #     if self.integral_shank_diameter <= 0 and self.cutting_tool_type == '整体式刀具':
+    #         raise ValidationError("柄部直径不能为0")
+    #
+    # @api.constrains('integral_blade_diameter')
+    # def _check_integral_blade_diameter(self):
+    #     if self.integral_blade_diameter <= 0 and self.cutting_tool_type == '整体式刀具':
+    #         raise ValidationError("刃部直径不能为0")
+    #
+    # @api.constrains('integral_run_out_accuracy_min')
+    # def _check_integral_blade_diameter(self):
+    #     if self.integral_run_out_accuracy_min <= 0 and self.cutting_tool_type == '整体式刀具':
+    #         raise ValidationError("端跳精度最小(min)不能为0")
 
-    @api.constrains('blade_tip_characteristics_ids')
-    def _check_blade_tip_characteristics_ids(self):
-        for record in self:
-            if len(record.blade_tip_characteristics_ids) == 0 and self.cutting_tool_type == '整体式刀具':
-                raise ValidationError("刀尖特征不能为空!")
-            if len(record.blade_tip_characteristics_ids) > 1 and self.cutting_tool_type == '整体式刀具':
-                raise ValidationError("刀尖特征只能单选!")
-
-    @api.constrains('handle_type_ids')
-    def _check_handle_type_ids(self):
-        for record in self:
-            if len(record.handle_type_ids) == 0 and self.cutting_tool_type == '整体式刀具':
-                raise ValidationError("柄部类型不能为空!")
-            if len(record.handle_type_ids) > 1 and self.cutting_tool_type == '整体式刀具':
-                raise ValidationError("柄部类型只能单选!")
-
-    @api.constrains('cutting_direction_ids')
-    def _check_cutting_direction_ids(self):
-        for record in self:
-            if len(record.cutting_direction_ids) == 0 and self.cutting_tool_type == '整体式刀具':
-                raise ValidationError("走刀方向不能为空!")
-
-    @api.constrains('suitable_coolant_ids')
-    def _check_suitable_coolant_ids(self):
-        for record in self:
-            if not record.suitable_coolant_ids and self.cutting_tool_type == '整体式刀具':
-                raise ValidationError("适合冷却液不能为空!")
-
-    @api.constrains('cutting_tool_total_length')
-    def _check_cutting_tool_total_length(self):
-        if self.cutting_tool_total_length <= 0 and self.cutting_tool_type == '整体式刀具':
-            raise ValidationError("总长度不能为0")
-
-    @api.constrains('cutting_tool_shank_length')
-    def _check_cutting_tool_shank_length(self):
-        if self.cutting_tool_shank_length <= 0 and self.cutting_tool_type == '整体式刀具':
-            raise ValidationError("柄部长度不能为0")
-
-    @api.constrains('cutting_tool_blade_length')
-    def _check_cutting_tool_blade_length(self):
-        if self.cutting_tool_blade_length <= 0 and self.cutting_tool_type == '整体式刀具':
-            raise ValidationError("刃部长度不能为0")
-
-    @api.constrains('cutting_tool_blade_number')
-    def _check_cutting_tool_blade_number(self):
-        if self.cutting_tool_blade_number <= 0 and self.cutting_tool_type == '整体式刀具':
-            raise ValidationError("刃数不能为0")
-
-    @api.constrains('integral_shank_diameter')
-    def _check_integral_shank_diameter(self):
-        if self.integral_shank_diameter <= 0 and self.cutting_tool_type == '整体式刀具':
-            raise ValidationError("柄部直径不能为0")
-
-    @api.constrains('integral_blade_diameter')
-    def _check_integral_blade_diameter(self):
-        if self.integral_blade_diameter <= 0 and self.cutting_tool_type == '整体式刀具':
-            raise ValidationError("刃部直径不能为0")
-
-    @api.constrains('integral_run_out_accuracy_min')
-    def _check_integral_blade_diameter(self):
-        if self.integral_run_out_accuracy_min <= 0 and self.cutting_tool_type == '整体式刀具':
-            raise ValidationError("端跳精度最小(min)不能为0")
-
-    @api.constrains('integral_run_out_accuracy_max')
-    def _check_integral_run_out_accuracy_max(self):
-        if self.integral_run_out_accuracy_max <= 0 and self.cutting_tool_type == '整体式刀具':
-            raise ValidationError("端跳精度最大(max)不能为0")
+    # @api.constrains('integral_run_out_accuracy_max')
+    # def _check_integral_run_out_accuracy_max(self):
+    #     if self.integral_run_out_accuracy_max <= 0 and self.cutting_tool_type == '整体式刀具':
+    #         raise ValidationError("端跳精度最大(max)不能为0")
 
     cutting_tool_diameter = fields.Float('直径(mm)')
     cutting_tool_front_angle = fields.Float('前角(°)')
@@ -190,7 +191,7 @@ class ResProductMo(models.Model):
         string='适用夹头型号')
     # 刀片参数
     cutting_tool_top_angle = fields.Float('顶角(°)')
-    cutting_tool_jump_accuracy = fields.Float('径跳精度(um)')
+    cutting_tool_jump_accuracy = fields.Float('径跳精度(mm)')
     cutting_tool_working_hardness = fields.Char('加工硬度(hrc)')
     cutting_tool_cutter_bar_ids = fields.Many2many(
         'sf.cutting.tool.model',
@@ -209,7 +210,7 @@ class ResProductMo(models.Model):
         string='适用刀盘型号'  # 使用空列表作为默认值
     )
     # 刀杆/参数
-    cutting_tool_blade_diameter = fields.Float('刃径(mm)')
+    cutting_tool_blade_diameter = fields.Float('刃径/刃部直径(mm)')
     cutting_tool_blade_ids = fields.Many2many(
         'sf.cutting.tool.model',
         relation='product_cutting_tool_model_pad_blade_rel',
@@ -219,16 +220,41 @@ class ResProductMo(models.Model):
         string='适用刀片型号'  # 使用空列表作为默认值
     )
     cutting_tool_wrench = fields.Float('配对扳手(mm)')
-    cutting_tool_screw = fields.Float('配备螺丝(mm)')
+    # cutting_tool_screw = fields.Float('配备螺丝(mm)')
     cutting_tool_accuracy_level = fields.Char('精度等级')
     # 刀柄参数
+    cutting_tool_head_diameter = fields.Float('头部直径')
     cutting_tool_diameter_max = fields.Float('最大直径(mm)')
     cutting_tool_clamping_diameter = fields.Float('夹持直径(mm)')
-    cutting_tool_flange_length = fields.Float('法兰柄长度(mm)')
+    cutting_tool_clamping_length = fields.Float('夹持长度(mm)')
+    cutting_tool_clamping_tolerance = fields.Float('夹持公差(mm)')
+    cutting_tool_clamping_diameter_max = fields.Float('最大夹持直径')
+    cutting_tool_clamping_diameter_min = fields.Float('最小夹持直径')
+    cutting_tool_flange_length = fields.Float('法兰柄长(mm)')
     cutting_tool_flange_diameter = fields.Float('法兰直径(mm)')
+    cutting_tool_is_rough_finish = fields.Boolean('可粗加工', default=False)
+    cutting_tool_is_finish = fields.Boolean('可精加工', default=False)
+    cutting_tool_is_drill_hole = fields.Boolean('可钻孔', default=False)
+    cutting_tool_is_safety_lock = fields.Boolean('安全锁', default=False)
+    cutting_tool_is_high_speed_cutting = fields.Boolean('可高速切削', default=False)
+    cutting_tool_dynamic_balance_class = fields.Char('动平衡等级')
+    cutting_tool_change_time = fields.Integer('换刀时间(s)')
+    cutting_tool_clamping_way = fields.Char('夹持方式')
+    cutting_tool_standard_speed = fields.Integer('标准转速(n/min)')
+    cutting_tool_speed_max = fields.Integer('最大转速(n/min)')
+    cutting_tool_cooling_type = fields.Char('冷却类型')
+    cutting_tool_body_accuracy = fields.Float('本体精度(mm)')
+    apply_lock_nut_model = fields.Char('适用锁紧螺母型号')
+    apply_lock_wrench_model = fields.Char('适用锁紧扳手型号')
+    cutting_tool_detection_accuracy_max = fields.Char('最大检测精度(mm)')
+    cutting_tool_detection_accuracy_min = fields.Char('最小检测精度(mm)')
     # 夹头参数
+    cutting_tool_taper = fields.Integer('锥度(°)')
     cutting_tool_outer_diameter = fields.Float('外径(mm)')
     cutting_tool_inner_diameter = fields.Float('内径(mm)')
+    cooling_suit_type_ids = fields.Char('适用冷却套型号')
+    # cooling_suit_type_ids = fields.Many2many('冷却类型')
+    cutting_tool_er_size_model = fields.Char('ER尺寸型号')
     cutting_tool_handle_ids = fields.Many2many(
         'sf.cutting.tool.model',
         relation='product_cutting_tool_model_chuck_handle_rel',
@@ -407,117 +433,119 @@ class ResProductMo(models.Model):
                     item.fixture_apply_machine_tool_type_ids = self._get_ids(
                         item.fixture_model_id.apply_machine_tool_type_ids)
 
-    @api.onchange('cutting_tool_model_id')
-    def _onchange_cutting_tool_model_id(self):
-        for item in self:
-            if self.cutting_tool_type is not False:
-                item.brand_id = item.cutting_tool_model_id.brand_id.id
-                item.cutting_tool_type_id = item.cutting_tool_model_id.cutting_tool_type_id.id
-                item.tool_length = item.cutting_tool_model_id.tool_length
-                item.tool_width = item.cutting_tool_model_id.tool_width
-                item.tool_height = item.cutting_tool_model_id.tool_height
-                item.tool_thickness = item.cutting_tool_model_id.tool_thickness
-                item.tool_weight = item.cutting_tool_model_id.tool_weight
-                item.coating_material = item.cutting_tool_model_id.coating_material
-                item.cutting_tool_total_length = item.cutting_tool_model_id.total_length
-                item.cutting_tool_shank_length = item.cutting_tool_model_id.shank_length
-                item.integral_neck_length = item.cutting_tool_model_id.integral_neck_length
-                item.integral_shank_diameter = item.cutting_tool_model_id.integral_shank_diameter
-                item.integral_blade_diameter = item.cutting_tool_model_id.integral_blade_diameter
-                item.integral_neck_diameter = item.cutting_tool_model_id.integral_neck_diameter
-                item.integral_blade_tip_diameter = item.cutting_tool_model_id.integral_blade_tip_diameter
-                item.integral_blade_tip_taper = item.cutting_tool_model_id.integral_blade_tip_taper
-                item.integral_blade_helix_angle = item.cutting_tool_model_id.integral_blade_helix_angle
-                item.integral_blade_type = item.cutting_tool_model_id.integral_blade_type
-                item.integral_coarse_medium_fine = item.cutting_tool_model_id.integral_coarse_medium_fine
-                item.integral_hardness = item.cutting_tool_model_id.integral_hardness
-                item.integral_run_out_accuracy_max = item.cutting_tool_model_id.integral_run_out_accuracy_max
-                item.integral_run_out_accuracy_min = item.cutting_tool_model_id.integral_run_out_accuracy_min
-                item.suitable_machining_method_ids = self._get_ids(item.cutting_tool_model_id.suitable_machining_method_ids)
-                item.blade_tip_characteristics_ids = self._get_ids(item.cutting_tool_model_id.blade_tip_characteristics_ids)
-                item.handle_type_ids = self._get_ids(item.cutting_tool_model_id.handle_type_ids)
-                item.cutting_direction_ids = self._get_ids(item.cutting_tool_model_id.cutting_direction_ids)
-                item.suitable_coolant_ids = self._get_ids(item.cutting_tool_model_id.suitable_coolant_ids)
-                item.cutting_tool_diameter = item.cutting_tool_model_id.diameter
-                item.cutting_tool_blade_number = item.cutting_tool_model_id.blade_number
-                item.cutting_tool_front_angle = item.cutting_tool_model_id.front_angle
-                item.cutting_tool_rear_angle = item.cutting_tool_model_id.rear_angle
-                item.cutting_tool_main_included_angle = item.cutting_tool_model_id.main_included_angle
-                item.materials_type_id = item.cutting_tool_model_id.material_model_id.id
-                item.cutting_tool_nut = item.cutting_tool_model_id.nut
-                item.cutting_tool_top_angle = item.cutting_tool_model_id.top_angle
-                item.cutting_tool_jump_accuracy = item.cutting_tool_model_id.jump_accuracy
-                item.cutting_tool_working_hardness = item.cutting_tool_model_id.working_hardness
-                item.cutting_tool_blade_diameter = item.cutting_tool_model_id.blade_diameter
-                item.cutting_tool_wrench = item.cutting_tool_model_id.wrench
-                item.cutting_tool_screw = item.cutting_tool_model_id.screw
-                item.cutting_tool_accuracy_level = item.cutting_tool_model_id.accuracy_level
-                item.cutting_tool_diameter_max = item.cutting_tool_model_id.diameter_max
-                item.cutting_tool_clamping_diameter = item.cutting_tool_model_id.clamping_diameter
-                item.cutting_tool_flange_length = item.cutting_tool_model_id.flange_length
-                item.cutting_tool_flange_diameter = item.cutting_tool_model_id.flange_diameter
-                item.cutting_tool_outer_diameter = item.cutting_tool_model_id.outer_diameter
-                item.cutting_tool_inner_diameter = item.cutting_tool_model_id.inner_diameter
-                item.cutting_tool_chuck_ids = self._get_ids(item.cutting_tool_model_id.chuck_ids)
-                item.cutting_tool_cutter_bar_ids = self._get_ids(item.cutting_tool_model_id.cutter_bar_ids)
-                item.cutting_tool_cutter_pad_ids = self._get_ids(item.cutting_tool_model_id.cutter_pad_ids)
-                item.cutting_tool_blade_ids = self._get_ids(item.cutting_tool_model_id.blade_ids)
-                item.cutting_tool_handle_ids = self._get_ids(item.cutting_tool_model_id.handle_ids)
-            else:
-                item.brand_id = False
-                item.cutting_tool_type_id = False
-                item.brand_id = False
-                item.tool_length = False
-                item.tool_width = False
-                item.tool_height = False
-                item.tool_thickness = False
-                item.tool_weight = False
-                item.coating_material = False
-                item.cutting_tool_total_length = False
-                item.cutting_tool_shank_length = False
-                item.cutting_tool_blade_length = False
-                item.integral_neck_length = False
-                item.integral_shank_diameter = False
-                item.integral_blade_diameter = False
-                item.integral_neck_diameter = False
-                item.integral_blade_tip_diameter = False
-                item.integral_blade_tip_taper = False
-                item.integral_blade_helix_angle = False
-                item.integral_blade_type = False
-                item.integral_coarse_medium_fine = False
-                item.integral_hardness = False
-                item.integral_run_out_accuracy_max = False
-                item.integral_run_out_accuracy_min = False
-                item.suitable_machining_method_ids = False
-                item.blade_tip_characteristics_ids = False
-                item.handle_type_ids = False
-                item.cutting_direction_ids = False
-                item.suitable_coolant_ids = False
-                item.cutting_tool_diameter = False
-                item.cutting_tool_blade_number = False
-                item.cutting_tool_front_angle = False
-                item.cutting_tool_rear_angle = False
-                item.cutting_tool_main_included_angle = False
-                item.materials_type_id = False
-                item.cutting_tool_nut = False
-                item.cutting_tool_top_angle = False
-                item.cutting_tool_jump_accuracy = False
-                item.cutting_tool_working_hardness = False
-                item.cutting_tool_blade_diameter = False
-                item.cutting_tool_wrench = False
-                item.cutting_tool_screw = False
-                item.cutting_tool_accuracy_level = False
-                item.cutting_tool_diameter_max = False
-                item.cutting_tool_clamping_diameter = False
-                item.cutting_tool_flange_length = False
-                item.cutting_tool_flange_diameter = False
-                item.cutting_tool_outer_diameter = False
-                item.cutting_tool_inner_diameter = False
-                item.cutting_tool_chuck_ids = False
-                item.cutting_tool_cutter_bar_ids = False
-                item.cutting_tool_cutter_pad_ids = False
-                item.cutting_tool_blade_ids = False
-                item.cutting_tool_handle_ids = False
+    # @api.onchange('cutting_tool_model_id')
+    # def _onchange_cutting_tool_model_id(self):
+    #     for item in self:
+    #         if self.cutting_tool_type is not False:
+    #             item.brand_id = item.cutting_tool_model_id.brand_id.id
+    #             item.cutting_tool_type_id = item.cutting_tool_model_id.cutting_tool_type_id.id
+    #             item.tool_length = item.cutting_tool_model_id.tool_length
+    #             item.tool_width = item.cutting_tool_model_id.tool_width
+    #             item.tool_height = item.cutting_tool_model_id.tool_height
+    #             item.tool_thickness = item.cutting_tool_model_id.tool_thickness
+    #             item.tool_weight = item.cutting_tool_model_id.tool_weight
+    #             item.coating_material = item.cutting_tool_model_id.coating_material
+    #             item.cutting_tool_total_length = item.cutting_tool_model_id.total_length
+    #             item.cutting_tool_shank_length = item.cutting_tool_model_id.shank_length
+    #             item.cutting_tool_neck_length = item.cutting_tool_model_id.cutting_tool_neck_length
+    #             item.cutting_tool_shank_diameter = item.cutting_tool_model_id.cutting_tool_shank_diameter
+    #             item.cutting_tool_blade_diameter = item.cutting_tool_model_id.cutting_tool_blade_diameter
+    #             item.cutting_tool_neck_diameter = item.cutting_tool_model_id.cutting_tool_neck_diameter
+    #             item.cutting_tool_blade_tip_diameter = item.cutting_tool_model_id.cutting_tool_blade_tip_diameter
+    #             item.cutting_tool_blade_tip_taper = item.cutting_tool_model_id.cutting_tool_blade_tip_taper
+    #             item.cutting_tool_blade_helix_angle = item.cutting_tool_model_id.cutting_tool_blade_helix_angle
+    #             item.cutting_tool_blade_type = item.cutting_tool_model_id.cutting_tool_blade_type
+    #             item.cutting_tool_coarse_medium_fine = item.cutting_tool_model_id.cutting_tool_coarse_medium_fine
+    #             item.tool_hardness = item.cutting_tool_model_id.tool_hardness
+    #             item.cutting_tool_run_out_accuracy_max = item.cutting_tool_model_id.cutting_tool_run_out_accuracy_max
+    #             item.cutting_tool_run_out_accuracy_min = item.cutting_tool_model_id.cutting_tool_run_out_accuracy_min
+    #             item.suitable_machining_method_ids = self._get_ids(
+    #                 item.cutting_tool_model_id.suitable_machining_method_ids)
+    #             item.blade_tip_characteristics_ids = self._get_ids(
+    #                 item.cutting_tool_model_id.blade_tip_characteristics_ids)
+    #             item.handle_type_ids = self._get_ids(item.cutting_tool_model_id.handle_type_ids)
+    #             item.cutting_direction_ids = self._get_ids(item.cutting_tool_model_id.cutting_direction_ids)
+    #             item.suitable_coolant_ids = self._get_ids(item.cutting_tool_model_id.suitable_coolant_ids)
+    #             item.cutting_tool_diameter = item.cutting_tool_model_id.diameter
+    #             item.cutting_tool_blade_number = item.cutting_tool_model_id.blade_number
+    #             item.cutting_tool_front_angle = item.cutting_tool_model_id.front_angle
+    #             item.cutting_tool_rear_angle = item.cutting_tool_model_id.rear_angle
+    #             item.cutting_tool_main_included_angle = item.cutting_tool_model_id.main_included_angle
+    #             item.materials_type_id = item.cutting_tool_model_id.material_model_id.id
+    #             item.cutting_tool_nut = item.cutting_tool_model_id.nut
+    #             item.cutting_tool_top_angle = item.cutting_tool_model_id.top_angle
+    #             item.cutting_tool_jump_accuracy = item.cutting_tool_model_id.jump_accuracy
+    #             item.cutting_tool_working_hardness = item.cutting_tool_model_id.working_hardness
+    #             item.cutting_tool_blade_diameter = item.cutting_tool_model_id.blade_diameter
+    #             item.cutting_tool_wrench = item.cutting_tool_model_id.wrench
+    #             # item.cutting_tool_screw = item.cutting_tool_model_id.screw
+    #             item.cutting_tool_accuracy_level = item.cutting_tool_model_id.accuracy_level
+    #             item.cutting_tool_diameter_max = item.cutting_tool_model_id.diameter_max
+    #             item.cutting_tool_clamping_diameter = item.cutting_tool_model_id.clamping_diameter
+    #             item.cutting_tool_flange_length = item.cutting_tool_model_id.flange_length
+    #             item.cutting_tool_flange_diameter = item.cutting_tool_model_id.flange_diameter
+    #             item.cutting_tool_outer_diameter = item.cutting_tool_model_id.outer_diameter
+    #             item.cutting_tool_inner_diameter = item.cutting_tool_model_id.inner_diameter
+    #             item.cutting_tool_chuck_ids = self._get_ids(item.cutting_tool_model_id.chuck_ids)
+    #             item.cutting_tool_cutter_bar_ids = self._get_ids(item.cutting_tool_model_id.cutter_bar_ids)
+    #             item.cutting_tool_cutter_pad_ids = self._get_ids(item.cutting_tool_model_id.cutter_pad_ids)
+    #             item.cutting_tool_blade_ids = self._get_ids(item.cutting_tool_model_id.blade_ids)
+    #             item.cutting_tool_handle_ids = self._get_ids(item.cutting_tool_model_id.handle_ids)
+    #         else:
+    #             item.brand_id = False
+    #             item.cutting_tool_type_id = False
+    #             item.brand_id = False
+    #             item.tool_length = False
+    #             item.tool_width = False
+    #             item.tool_height = False
+    #             item.tool_thickness = False
+    #             item.tool_weight = False
+    #             item.coating_material = False
+    #             item.cutting_tool_total_length = False
+    #             item.cutting_tool_shank_length = False
+    #             item.cutting_tool_blade_length = False
+    #             item.cutting_tool_neck_length = False
+    #             item.cutting_tool_shank_diameter = False
+    #             item.cutting_tool_blade_diameter = False
+    #             item.cutting_tool_neck_diameter = False
+    #             item.cutting_tool_blade_tip_diameter = False
+    #             item.cutting_tool_blade_tip_taper = False
+    #             item.cutting_tool_blade_helix_angle = False
+    #             item.cutting_tool_blade_type = False
+    #             item.cutting_tool_coarse_medium_fine = False
+    #             item.tool_hardness = False
+    #             item.cutting_tool_run_out_accuracy_max = False
+    #             item.cutting_tool_run_out_accuracy_min = False
+    #             item.suitable_machining_method_ids = False
+    #             item.blade_tip_characteristics_ids = False
+    #             item.handle_type_ids = False
+    #             item.cutting_direction_ids = False
+    #             item.suitable_coolant_ids = False
+    #             item.cutting_tool_diameter = False
+    #             item.cutting_tool_blade_number = False
+    #             item.cutting_tool_front_angle = False
+    #             item.cutting_tool_rear_angle = False
+    #             item.cutting_tool_main_included_angle = False
+    #             item.materials_type_id = False
+    #             item.cutting_tool_nut = False
+    #             item.cutting_tool_top_angle = False
+    #             item.cutting_tool_jump_accuracy = False
+    #             item.cutting_tool_working_hardness = False
+    #             item.cutting_tool_blade_diameter = False
+    #             item.cutting_tool_wrench = False
+    #             # item.cutting_tool_screw = False
+    #             item.cutting_tool_accuracy_level = False
+    #             item.cutting_tool_diameter_max = False
+    #             item.cutting_tool_clamping_diameter = False
+    #             item.cutting_tool_flange_length = False
+    #             item.cutting_tool_flange_diameter = False
+    #             item.cutting_tool_outer_diameter = False
+    #             item.cutting_tool_inner_diameter = False
+    #             item.cutting_tool_chuck_ids = False
+    #             item.cutting_tool_cutter_bar_ids = False
+    #             item.cutting_tool_cutter_pad_ids = False
+    #             item.cutting_tool_blade_ids = False
+    #             item.cutting_tool_handle_ids = False
 
     def _get_volume_uom_id_from_ir_config_parameter(self):
         product_length_in_feet_param = self.env['ir.config_parameter'].sudo().get_param('product.volume_in_cubic_feet')
@@ -695,9 +723,9 @@ class ResProductMo(models.Model):
 
     # 将attach的datas内容转为glb文件
     def transition_glb_file(self, report_path, code):
-        shapes = read_step_file(report_path)
+        # shapes = read_step_file(report_path)
         output_file = os.path.join('/tmp', str(code) + '.stl')
-        write_stl_file(shapes, output_file, 'binary', 0.03, 0.5)
+        # write_stl_file(shapes, output_file, 'binary', 0.03, 0.5)
         # 转化为glb
         output_glb_file = os.path.join('/tmp', str(code) + '.glb')
         util_path = get_resource_path('sf_dlm', 'static/util')
diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py
index 68e45759..634a0afe 100644
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -197,21 +197,19 @@ class StockRule(models.Model):
                 for workorder in production.workorder_ids:
                     workorder_duration += workorder.duration_expected
 
-
                 sale_order = self.env['sale.order'].sudo().search([('name', '=', production.origin)])
                 if sale_order:
                     bb = sale_order.deadline_of_delivery
-                productions = self.env['sf.production.plan'].with_user(SUPERUSER_ID).sudo().with_company(company_id).\
+                productions = self.env['sf.production.plan'].with_user(SUPERUSER_ID).sudo().with_company(company_id). \
                     create({
-                        'name': production.name,
-                        'production_id': production.id,
-                        'date_planned_start': production.date_planned_start,
-                        'origin': production.origin,
-                        'product_qty': production.product_qty,
-                        'product_id': production.product_id.id,
-                        'state': 'draft',
-                    })
-
+                    'name': production.name,
+                    'production_id': production.id,
+                    'date_planned_start': production.date_planned_start,
+                    'origin': production.origin,
+                    'product_qty': production.product_qty,
+                    'product_id': production.product_id.id,
+                    'state': 'draft',
+                })
 
         return True
 
@@ -450,6 +448,7 @@ class ReStockMove(models.Model):
                 'tool_height': item.product_id.tool_height,
                 'tool_thickness': item.product_id.tool_thickness,
                 'tool_weight': item.product_id.tool_weight,
+                'tool_hardness': item.product_id.tool_hardness,
                 'coating_material': item.product_id.coating_material,
                 'amount': int(item.quantity_done),
                 # 'model_file': '' if not item.product_id.fixture_model_file else base64.b64encode(
@@ -458,6 +457,17 @@ class ReStockMove(models.Model):
                 'total_length': item.product_id.cutting_tool_total_length,
                 'shank_length': item.product_id.cutting_tool_shank_length,
                 'blade_length': item.product_id.cutting_tool_blade_length,
+                'neck_length': item.product_id.cutting_tool_neck_length,
+                'neck_diameter': item.product_id.cutting_tool_neck_diameter,
+                'shank_diameter': item.product_id.cutting_tool_shank_diameter,
+                'blade_tip_diameter': item.product_id.cutting_tool_blade_tip_diameter,
+                'blade_tip_taper': item.product_id.cutting_tool_blade_tip_taper,
+                'blade_helix_angle': item.product_id.cutting_tool_blade_helix_angle,
+                'blade_type': item.product_id.cutting_tool_blade_type,
+                'coarse_medium_fine': item.product_id.cutting_tool_coarse_medium_fine,
+                'run_out_accuracy_max': item.product_id.cutting_tool_run_out_accuracy_max,
+                'run_out_accuracy_min': item.product_id.cutting_tool_run_out_accuracy_min,
+                'head_diameter': item.product_id.cutting_tool_head_diameter,
                 'diameter': item.product_id.cutting_tool_diameter,
                 'blade_number': item.product_id.cutting_tool_blade_number,
                 'front_angle': item.product_id.cutting_tool_front_angle,
@@ -474,14 +484,35 @@ class ReStockMove(models.Model):
                 'working_hardness': item.product_id.cutting_tool_working_hardness,
                 'blade_diameter': item.product_id.cutting_tool_blade_diameter,
                 'wrench': item.product_id.cutting_tool_wrench,
-                'screw': item.product_id.cutting_tool_screw,
                 'accuracy_level': item.product_id.cutting_tool_accuracy_level,
+                'clamping_way': item.product_id.cutting_tool_clamping_way,
+                'clamping_length': item.product_id.cutting_tool_clamping_length,
+                'clamping_tolerance': item.product_id.cutting_tool_clamping_tolerance,
                 'diameter_max': item.product_id.cutting_tool_diameter_max,
-                'clamping_diameter': item.product_id.cutting_tool_clamping_diameter,
+                'clamping_diameter_min': item.product_id.cutting_tool_clamping_diameter_min,
+                'clamping_diameter_max': item.product_id.cutting_tool_clamping_diameter_max,
+                'detection_accuracy_max': item.product_id.cutting_tool_detection_accuracy_max,
+                'detection_accuracy_min': item.product_id.cutting_tool_detection_accuracy_min,
+                'is_rough_finish': item.product_id.cutting_tool_is_rough_finish,
+                'is_finish': item.product_id.cutting_tool_is_finish,
+                'is_drill_hole': item.product_id.cutting_tool_is_drill_hole,
+                'is_safety_lock': item.product_id.cutting_tool_is_safety_lock,
+                'is_high_speed_cutting': item.product_id.cutting_tool_is_high_speed_cutting,
+                'dynamic_balance_class': item.product_id.cutting_tool_dynamic_balance_class,
+                'change_time': item.product_id.cutting_tool_change_time,
+                'standard_speed': item.product_id.cutting_tool_standard_speed,
+                'speed_max': item.product_id.cutting_tool_speed_max,
+                'cooling_type': item.product_id.cutting_tool_cooling_type,
+                'body_accuracy ': item.product_id.cutting_tool_body_accuracy,
+                'apply_lock_nut_model': item.product_id.apply_lock_nut_model,
+                'apply_lock_wrench_model': item.product_id.apply_lock_wrench_model,
+                'tool_taper': item.product_id.cutting_tool_taper,
                 'flange_length': item.product_id.cutting_tool_flange_length,
                 'flange_diameter': item.product_id.cutting_tool_flange_diameter,
                 'outer_diameter': item.product_id.cutting_tool_outer_diameter,
                 'inner_diameter': item.product_id.cutting_tool_inner_diameter,
+                'cooling_suit_type_ids': item.product_id.cooling_suit_type_ids,
+                'er_size_model': item.product_id.cutting_tool_er_size_model,
             }
         try:
             if item.product_id.industry_code:
@@ -514,5 +545,3 @@ class ReStockQuant(models.Model):
             elif self.product_id.categ_type == '刀具':
                 stock._register_cutting_tool()
         return True
-    
-

From e50f0c44654c6138fe86db4dceb28d9b9202543e Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Fri, 8 Sep 2023 14:10:48 +0800
Subject: [PATCH 2/3] =?UTF-8?q?Merge=20branch=20'develop'=20of=20https://e?=
 =?UTF-8?q?.coding.net/jikimo-hn/jikimo=5Fsfs/jikimo=5Fsf=20into=20feature?=
 =?UTF-8?q?/=E5=88=80=E6=9F=84=E5=92=8C=E5=A4=B9=E5=A4=B4=E5=8F=8D?=
 =?UTF-8?q?=E6=B3=A8=E5=86=8C=E5=88=B0Cloud=E7=94=9F=E6=88=90=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E5=88=80=E5=85=B7=E7=89=A9=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Conflicts:
#	sf_manufacturing/models/product_template.py
---
 sf_manufacturing/models/product_template.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index 9729d1c9..1d1ed2ba 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -761,8 +761,7 @@ class ResMrpBomMo(models.Model):
         }
         return self.env['mrp.bom.line'].create(vals)
 
-        # 业务平台分配工厂后在智能工厂先创建销售订单再创建该产品后再次进行创建bom
-
+    # 业务平台分配工厂后在智能工厂先创建销售订单再创建该产品后再次进行创建bom
     def bom_create(self, product, bom_type, product_type):
         bom_id = self.env['mrp.bom'].create({
             'product_tmpl_id': product.product_tmpl_id.id,
@@ -779,7 +778,6 @@ class ResMrpBomMo(models.Model):
         # 坯料BOM组件：选取当前坯料原材料，
         # 然后根据当前的坯料的体积得出需要的原材料重量（立方米m³） *材料密度 * 1000 = 所需原材料重量KG（公斤）
         # 坯料所需原材料公式：当前的坯料的体积（立方米m³） *材料密度 * 1000 = 所需原材料重量KG（公斤）
-
     def bom_create_line(self, embryo):
         # 选取当前坯料原材料
         raw_bom_line = self.get_raw_bom(embryo)
@@ -826,8 +824,7 @@ class ResMrpBomMo(models.Model):
         else:
             return
 
-        # 查bom的原材料
-
+    # 查bom的原材料
     def get_raw_bom(self, product):
         raw_bom = self.env['product.product'].search(
             [('categ_id.type', '=', '原材料'), ('materials_type_id', '=', product.materials_type_id.id)])

From c1be9a90fe1716c08ae2024852ac05f5ce7e9048 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Fri, 8 Sep 2023 17:14:57 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=88=80=E5=85=B7?=
 =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=8F=8D=E6=B3=A8=E5=86=8C=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=9B=BE=E7=89=87=E5=AD=97=E6=AE=B5=EF=BC=8C?=
 =?UTF-8?q?3d=E6=A8=A1=E5=9E=8B=E4=BB=A3=E7=A0=81=E6=94=BE=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/product_template.py | 8 ++++----
 sf_manufacturing/models/stock.py            | 1 +
 sf_sale/models/quick_easy_order.py          | 8 ++++----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index a121ee1f..6f50425f 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -1,8 +1,8 @@
 from odoo import models, fields, api
 from odoo.exceptions import ValidationError
 from odoo.modules import get_resource_path
-# from OCC.Extend.DataExchange import read_step_file
-# from OCC.Extend.DataExchange import write_stl_file
+from OCC.Extend.DataExchange import read_step_file
+from OCC.Extend.DataExchange import write_stl_file
 import logging
 import base64
 import hashlib
@@ -732,9 +732,9 @@ class ResProductMo(models.Model):
 
     # 将attach的datas内容转为glb文件
     def transition_glb_file(self, report_path, code):
-        # shapes = read_step_file(report_path)
+        shapes = read_step_file(report_path)
         output_file = os.path.join('/tmp', str(code) + '.stl')
-        # write_stl_file(shapes, output_file, 'binary', 0.03, 0.5)
+        write_stl_file(shapes, output_file, 'binary', 0.03, 0.5)
         # 转化为glb
         output_glb_file = os.path.join('/tmp', str(code) + '.glb')
         util_path = get_resource_path('sf_dlm', 'static/util')
diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py
index 45b38443..fd014941 100644
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -513,6 +513,7 @@ class ReStockMove(models.Model):
                 'inner_diameter': item.product_id.cutting_tool_inner_diameter,
                 'cooling_suit_type_ids': item.product_id.cooling_suit_type_ids,
                 'er_size_model': item.product_id.cutting_tool_er_size_model,
+                'image': '' if not item.product_id.image_1920 else base64.b64encode(item.product_id.image_1920).decode('utf-8'),
             }
         try:
             if item.product_id.industry_code:
diff --git a/sf_sale/models/quick_easy_order.py b/sf_sale/models/quick_easy_order.py
index 08d5ae30..eed2be57 100644
--- a/sf_sale/models/quick_easy_order.py
+++ b/sf_sale/models/quick_easy_order.py
@@ -1,7 +1,7 @@
 from odoo import models, fields, api
 from odoo.modules import get_resource_path
-# from OCC.Extend.DataExchange import read_step_file
-# from OCC.Extend.DataExchange import write_stl_file
+from OCC.Extend.DataExchange import read_step_file
+from OCC.Extend.DataExchange import write_stl_file
 from odoo.exceptions import ValidationError, UserError
 from odoo.addons.sf_base.commons.common import Common
 from datetime import datetime
@@ -87,10 +87,10 @@ class QuickEasyOrder(models.Model):
 
     # 将attach的datas内容转为glb文件
     def transition_glb_file(self, report_path, model_code):
-        # shapes = read_step_file(report_path)
+        shapes = read_step_file(report_path)
         # output_file = os.path.join('C:/Users/43484/Desktop/机企猫工作文档', str(model_code) + '.stl')
         output_file = os.path.join('/tmp', str(model_code) + '.stl')
-        # write_stl_file(shapes, output_file, 'binary', 0.03, 0.5)
+        write_stl_file(shapes, output_file, 'binary', 0.03, 0.5)
         # 转化为glb
         # output_glb_file = os.path.join('C:/Users/43484/Desktop/机企猫工作文档', str(model_code) + '.glb')
         output_glb_file = os.path.join('/tmp', str(model_code) + '.glb')