Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/产品的权限优化

# Conflicts:
#	sf_dlm_management/views/product_template_management_view.xml
#	sf_sale/models/quick_easy_order.py
#	sf_sale/models/sale_order.py
#	sf_sale/views/purchase_order_view.xml

sf_dlm_management/__manifest__.py

@@ -11,7 +11,7 @@
     'website': 'https://www.sf.jikimo.com',
     'depends': ['sf_sale', 'sf_dlm', 'sf_manufacturing'],
     'data': [
-        'data/stock_data.xml',
+        # 'data/stock_data.xml',
         'views/product_template_management_view.xml',
     ],
     'demo': [

sf_dlm_management/views/product_template_management_view.xml

@@ -7,7 +7,11 @@
             <field name="inherit_id" ref="sf_sale.view_product_template_form_inherit_sf"/>
             <field name="arch" type="xml">
                 <field name="invoice_policy" position="after">
+<<<<<<< HEAD
+                    <field name='categ_id'/>
+=======
                     <field name='categ_id' attrs="{'readonly': [('id', '!=', False)]}"/>
+>>>>>>> 8695a66e3d9be860f778caba8db5500885f4548f
                     <field name='is_bfm' invisible="1"/>
                     <field name='categ_type' invisible="1"/>
                     <field name="upload_model_file"
@@ -18,6 +22,24 @@
                     <field name='cutting_tool_type' invisible="1"/>
                     <field name="fixture_material_type" invisible="1"/>
                     <field name="embryo_model_type_id" string="模型类型"
+<<<<<<< HEAD
+                           attrs="{'invisible': ['|',('categ_type', '!=', '坯料'),('categ_type', '=', False)]}"/>
+                    <field name="materials_id" string="材料" placeholder="请选择"
+                           attrs="{'invisible': [('categ_type', 'not in', ['成品','坯料', '原材料'])]}"/>
+                    <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', '!=', '刀具')]}"
+                           placeholder="请选择"/>
+                    <field name="cutting_tool_model_id" placeholder="请选择"
+                           attrs="{'invisible': [('categ_type', '!=', '刀具')]}"
+                           domain="[('cutting_tool_material_id','=',cutting_tool_material_id)]"/>
+                    <field name="specification_id" placeholder="请选择" options='{"limit": 1}'
+                           attrs="{'invisible': [('categ_type', '!=', '刀具')]}"
+=======
                            attrs="{'invisible': ['|',('categ_type', '!=', '坯料'),('categ_type', '=', False)],'readonly': [('id', '!=', False)]}"/>
                     <field name="materials_id" string="材料" placeholder="请选择"
                            attrs="{'invisible': [('categ_type', 'not in', ['成品','坯料', '原材料'])],'readonly': [('id', '!=', False)]}"/>
@@ -35,15 +57,19 @@
                            domain="[('cutting_tool_material_id','=',cutting_tool_material_id)]"/>
                     <field name="specification_id" placeholder="请选择"
                            attrs="{'invisible': [('categ_type', '!=', '刀具')],'readonly': [('id', '!=', False)]}"
+>>>>>>> 8695a66e3d9be860f778caba8db5500885f4548f
                            domain="[('standard_library_id','=',cutting_tool_model_id)]"/>
                     <field name="fixture_material_id" attrs="{'invisible': [('categ_type', '!=', '夹具')]}"
                            placeholder="请选择"/>
                     <field name="fixture_model_id" string="型号" placeholder="请选择"
                            attrs="{'invisible': [('categ_type', '!=', '夹具')],'required': [('categ_type', '=', '夹具')]}"
                            domain="[('fixture_material_id','=',fixture_material_id)]"/>
+<<<<<<< HEAD
+=======
                     <field name="specification_fixture_id" string="规格" placeholder="请选择"
                            attrs="{'invisible': [('categ_type', '!=', '夹具')]}"
                            domain="[('fixture_model_id','=',fixture_model_id)]"/>
+>>>>>>> 8695a66e3d9be860f778caba8db5500885f4548f
                 </field>
                 <xpath expr="//label[@for='volume']" position="before">
                     <label for="length" string="尺寸"
@@ -99,6 +125,26 @@
                 <field name="default_code" position="replace">
                     <field name='default_code' invisible="1"/>
                 </field>
+<<<<<<< HEAD
+                <xpath expr="//page[@name='variants']" position="before">
+                    <page string="刀具物料参数" attrs="{'invisible': [('categ_type', '!=', '刀具')]}">
+                        <group>
+                            <group attrs="{'invisible': [('categ_type', '!=', '刀具')]}" col="1">
+                                <field name="cutting_tool_type_id" options="{'no_create': True}"
+                                       placeholder="请选择"/>
+                                <field name="brand_id" options="{'no_create': True}" placeholder="请选择"/>
+                                <field name="cutting_tool_total_length"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀杆','刀盘','夹头','刀柄'))]}"/>
+                                <field name="tool_hardness" string="硬度(hrc)"/>
+                                <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','!=','整体式刀具')]}"/>
+=======
             </field>
         </record>
 
@@ -128,15 +174,101 @@
                                     <field name="cutting_tool_run_out_accuracy_min" class="o_address_zip"
                                            options="{'format': false}"
                                            attrs="{'invisible': [('cutting_tool_type','!=','整体式刀具')],'readonly': [('id', '!=', False)]}"/>
+>>>>>>> 8695a66e3d9be860f778caba8db5500885f4548f
                                     <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}"
+<<<<<<< HEAD
+                                           attrs="{'invisible': [('cutting_tool_type','!=','整体式刀具')]}"/>
+=======
                                            attrs="{'invisible': [('cutting_tool_type','!=','整体式刀具')],'readonly': [('id', '!=', False)]}"/>
+>>>>>>> 8695a66e3d9be860f778caba8db5500885f4548f
                                     <span>(mm)&amp;nbsp;</span>
                                 </div>
 
                                 <field name="tool_width"
+<<<<<<< HEAD
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')]}"/>
+                                <field name="tool_height"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')]}"/>
+                                <field name="cutting_tool_flange_length"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
+                                <field name="cutting_tool_shank_outer_diameter"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
+                                <field name="cutting_tool_shank_inner_diameter"
+                                       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_diameter" string="刃部直径(mm)" class="diameter"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
+                                <field name="cutting_tool_blade_length"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
+                                <field name="cutting_tool_blade_width"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
+                                <field name="cutting_tool_blade_depth"
+                                       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', '!=', '整体式刀具')]}"/>
+                                <field name="cutting_tool_blade_tip_working_size"
+                                       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="tool_length" string="尺寸(mm)"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
+                                <div class="test_model"
+                                     attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}">
+                                    <label for="tool_length" string="长"/>
+                                    <field name="tool_length" class="o_address_zip"
+                                           options="{'format': false}"/>
+                                    <label for="tool_thickness" string="厚"/>
+                                    <field name="tool_thickness" class="o_address_zip"
+                                           options="{'format': false}"/>
+                                    <label for="tool_width" string="宽"/>
+                                    <field name="tool_width" class="o_address_zip"
+                                           options="{'format': false}"/>
+                                </div>
+                                <field name="cutting_tool_cut_blade_length"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
+                                <field name="cutting_tool_blade_tip_circular_arc_radius"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
+                                <field name="cutting_tool_blade_tip_height_tolerance"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
+                                <field name="cutting_tool_inscribed_circle_diameter"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
+                                <field name="cutting_tool_inscribed_circle_tolerance"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
+                                <field name="cutting_tool_install_aperture_diameter"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
+                                <field name="cutting_tool_chip_breaker_groove"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
+                                <field name="cutting_tool_cut_depth_max"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
+                                <field name="cutting_tool_blade_blade_number" string="刃数"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
+                                <field name="cutting_tool_blade_width" string="刃宽"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
+=======
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="tool_height"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')],'readonly': [('id', '!=', False)]}"/>
@@ -198,6 +330,7 @@
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_cut_depth_max"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')],'readonly': [('id', '!=', False)]}"/>
+>>>>>>> 8695a66e3d9be860f778caba8db5500885f4548f
                                 <!--刀杆-->
 
                                 <label for="cutting_tool_knife_head_length" string="刀头尺寸(mm)"
@@ -206,6 +339,37 @@
                                      attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')]}">
                                     <label for="cutting_tool_knife_head_length" string="长"/>
                                     <field name="cutting_tool_knife_head_length" class="o_address_zip"
+<<<<<<< HEAD
+                                           options="{'format': false}"/>
+                                    <label for="cutting_tool_knife_head_width" string="宽"/>
+                                    <field name="cutting_tool_knife_head_width" class="o_address_zip"
+                                           options="{'format': false}"/>
+                                    <label for="cutting_tool_knife_head_height" string="高"/>
+                                    <field name="cutting_tool_knife_head_height" class="o_address_zip"
+                                           options="{'format': false}"/>
+                                </div>
+                                <field name="cutting_tool_blade_diameter" string="刃部直径(mm)" class="diameter"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))]}"/>
+
+                                <field name="cutting_tool_blade_length"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀盘')]}"/>
+
+                                <field name="cutting_tool_cutter_arbor_diameter"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')]}"/>
+                                <field name="cutting_tool_cut_blade_length" string="切削刃长度(mm)"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))]}"/>
+                                <field name="cutting_tool_cut_depth_max"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))]}"/>
+                                <field name="cutting_tool_min_machining_aperture"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')]}"/>
+                                <field name="cutting_tool_install_blade_tip_num"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')]}"/>
+                                <!--刀盘-->
+                                <field name="cutting_tool_cutter_head_diameter"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀盘')]}"/>
+                                <field name="cutting_tool_interface_diameter"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀盘')]}"/>
+=======
                                            options="{'format': false}"
                                            attrs="{'readonly': [('id', '!=', False)]}"/>
                                     <label for="cutting_tool_knife_head_width" string="宽"/>
@@ -238,6 +402,7 @@
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀盘')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_interface_diameter"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀盘')],'readonly': [('id', '!=', False)]}"/>
+>>>>>>> 8695a66e3d9be860f778caba8db5500885f4548f
 
                                 <!--夹头-->
                                 <label for="cutting_tool_clamping_diameter_min" string="夹持直径"
@@ -247,11 +412,144 @@
                                     <label for="cutting_tool_clamping_diameter_min" string="最小"/>
                                     <field name="cutting_tool_clamping_diameter_min" class="o_address_zip diameter"
                                            options="{'format': false}"
+<<<<<<< HEAD
+                                           attrs="{'required': [('cutting_tool_type','not in',('夹头','刀柄'))]}"/>
+=======
                                            attrs="{'required': [('cutting_tool_type','not in',('夹头','刀柄'))],'readonly': [('id', '!=', False)]}"/>
+>>>>>>> 8695a66e3d9be860f778caba8db5500885f4548f
                                     <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}"
+<<<<<<< HEAD
+                                           attrs="{'required': [('cutting_tool_type','not in',('夹头','刀柄'))]}"/>
+                                    <span>(mm)&amp;nbsp;</span>
+                                </div>
+                                <field name="cutting_tool_clamping_way"
+                                       attrs="{'invisible': [('cutting_tool_type','not in',('刀柄','夹头'))]}"/>
+                                <field name="cutting_tool_top_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', '!=', '刀柄')]}"/>
+                            </group>
+                            <group attrs="{'invisible': [('categ_type', '!=', '刀具')]}">
+                                <field name="materials_type_id" options="{'no_create': True}" placeholder="请选择"
+                                       string="材质"/>
+                                <field name="coating_material"/>
+                                <field name="cutting_tool_blade_type"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
+                                <field name="cutting_tool_coarse_medium_fine" string="粗/中/精" placeholder="请选择"
+                                       attrs="{'required': [('cutting_tool_type','=','整体式刀具')],'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))]}"/>
+                                <!--整体式刀具-->
+                                <field name="cutting_tool_shank_diameter" string="柄部直径(mm)" class="diameter"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
+                                <field name="cutting_tool_shank_length"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
+                                <field name="cutting_tool_neck_diameter" string="颈部直径(mm)" class="diameter"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
+                                <field name="cutting_tool_neck_length" string="颈部长度(mm)"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
+                                <field name="cutting_tool_cut_depth"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
+                                <field name="cutting_tool_pitch"
+                                       attrs="{'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', ('夹头','刀柄'))]}"/>
+                                <field name="cutting_tool_jump_accuracy"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
+                                <field name="cutting_tool_rear_angle"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}"/>
+                                <field name="cutting_tool_main_included_angle"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片','刀杆'))]}"/>
+                                <!--                                <field name="cutting_tool_front_angle"-->
+                                <!--                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}"/>-->
+                                <field name="cutting_tool_top_angle"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}"/>
+                                <field name="cutting_tool_blade_tip_dip_angle"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
+                                <field name="cutting_tool_side_cutting_edge_angle"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
+                                <field name="cutting_tool_pitch"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
+                                <field name="cutting_tool_bladed_teeth_model"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
+                                <field name="cutting_tool_thickness_tolerance"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
+                                <field name="cutting_tool_thread_model"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
+                                <field name="cutting_tool_thread_num"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
+                                <field name="cutting_tool_cutter_bar_ids" widget="many2many_tags"
+                                       options="{'no_create': True}"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
+                                <field name="cutting_tool_cutter_pad_ids" widget="many2many_tags"
+                                       options="{'no_create': True}"
+                                       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="cutting_tool_max_load_capacity"
+                                       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_rear_angle"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')]}"/>
+                                <field name="cutting_tool_installing_structure"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))]}"/>
+                                <field name="cutting_tool_is_cooling_hole"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))]}"/>
+                                <field name="cutting_tool_locating_slot_code"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))]}"/>
+                                <field name="cutting_tool_blade_ids" widget="many2many_tags"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))]}"/>
+                                <field name="cutting_tool_tool_shim"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')]}"/>
+                                <field name="cutting_tool_cotter_pin"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')]}"/>
+                                <field name="cutting_tool_pressing_plate"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')]}"/>
+                                <field name="cutting_tool_screw"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀柄'))]}"/>
+                                <field name="cutting_tool_wrench"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀柄'))]}"/>
+                                <!-- 刀盘 -->
+                                <field name="cutting_tool_blade_ids" widget="many2many_tags"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀盘')]}"/>
+                                <field name="cutting_tool_blade_ids" widget="many2many_tags"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀盘')]}"/>
+=======
                                            attrs="{'required': [('cutting_tool_type','not in',('夹头','刀柄'))],'readonly': [('id', '!=', False)]}"/>
                                     <span>(mm)&amp;nbsp;</span>
                                 </div>
@@ -376,29 +674,47 @@
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀盘')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_wrench"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀盘')],'readonly': [('id', '!=', False)]}"/>
+>>>>>>> 8695a66e3d9be860f778caba8db5500885f4548f
 
                             </group>
                         </group>
                         <group string="适配刀片形状"
                                attrs="{'invisible': [('cutting_tool_type', 'in', ('刀柄','夹头','整体式刀具',False))]}">
+<<<<<<< HEAD
+                            <field name="fit_blade_shape_id" string="" widget="many2one_radio"/>
+=======
                             <field name="fit_blade_shape_id" string="" widget="many2one_radio"
                                    attrs="{'readonly': [('id', '!=', False)]}"/>
+>>>>>>> 8695a66e3d9be860f778caba8db5500885f4548f
                         </group>
                         <group string="适合加工方式"
                                attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀杆','刀盘','刀片'))]}">
                             <field name="suitable_machining_method_ids" string=""
+<<<<<<< HEAD
+=======
                                    attrs="{'readonly': [('id', '!=', False)]}"
+>>>>>>> 8695a66e3d9be860f778caba8db5500885f4548f
                                    widget="custom_many2many_checkboxes"/>
                         </group>
                         <group string="刀尖特征"
                                attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀杆','刀盘','刀片'))]}">
                             <field name="blade_tip_characteristics_id" string=""
+<<<<<<< HEAD
+=======
                                    attrs="{'readonly': [('id', '!=', False)]}"
+>>>>>>> 8695a66e3d9be860f778caba8db5500885f4548f
                                    widget="many2one_radio"/>
                         </group>
                         <group attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀杆','刀盘','刀片'))]}">
                             <group string="柄部类型"
                                    attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}">
+<<<<<<< HEAD
+                                <field name="handle_type_id" string="" widget="many2one_radio"/>
+                            </group>
+                            <group string="压紧方式"
+                                   attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))]}">
+                                <field name="compaction_way_id" string="" widget="many2one_radio"/>
+=======
                                 <field name="handle_type_id" string="" widget="many2one_radio"
                                        attrs="{'readonly': [('id', '!=', False)]}"/>
                             </group>
@@ -406,23 +722,35 @@
                                    attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))]}">
                                 <field name="compaction_way_id" string="" widget="many2one_radio"
                                        attrs="{'readonly': [('id', '!=', False)]}"/>
+>>>>>>> 8695a66e3d9be860f778caba8db5500885f4548f
                             </group>
                         </group>
                         <group attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀杆','刀盘','刀片'))]}">
                             <group string="走刀方向">
+<<<<<<< HEAD
+                                <field name="cutting_direction_ids" string="" widget="custom_many2many_checkboxes"/>
+                            </group>
+                            <group string="适合冷却液">
+                                <field name="suitable_coolant_ids" string="" widget="custom_many2many_checkboxes"/>
+=======
                                 <field name="cutting_direction_ids" string="" widget="custom_many2many_checkboxes"
                                        attrs="{'readonly': [('id', '!=', False)]}"/>
                             </group>
                             <group string="适合冷却方式">
                                 <field name="suitable_coolant_ids" string="" widget="custom_many2many_checkboxes"
                                        attrs="{'readonly': [('id', '!=', False)]}"/>
+>>>>>>> 8695a66e3d9be860f778caba8db5500885f4548f
                             </group>
                         </group>
                         <notebook>
                             <page string="切削速度Vc"
                                   attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))]}">
+<<<<<<< HEAD
+                                <field name="cutting_speed_ids" string="" widget="one2many">
+=======
                                 <field name="cutting_speed_ids" string="" widget="one2many"
                                        attrs="{'readonly': [('id', '!=', False)]}" class="fixTableCss">
+>>>>>>> 8695a66e3d9be860f778caba8db5500885f4548f
                                     <tree editable="bottom">
                                         <field name="execution_standard_id"/>
                                         <field name="material_code"/>
@@ -435,9 +763,14 @@
                                 <script src="/sf_dlm_management/static/js/changeCss.js"></script>
                             </page>
                             <page string="每齿走刀量fz"
+<<<<<<< HEAD
+                                  attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))]}">
+                                <field name="feed_per_tooth_ids" string="" widget="one2many">
+=======
                                   attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))],'readonly': [('categ_type', '=', '刀具')]}">
                                 <field name="feed_per_tooth_ids" string="" widget="one2many"
                                        attrs="{'readonly': [('id', '!=', False)]}">
+>>>>>>> 8695a66e3d9be860f778caba8db5500885f4548f
                                     <tree editable="bottom">
                                         <!--                                        <field name="cutting_speed"-->
                                         <!--                                               attrs="{'readonly': [('materials_type_id','!=',False)]}"/>-->

sf_manufacturing/models/product_template.py

@@ -6,8 +6,8 @@ import os
 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
 
 
 class ResProductMo(models.Model):

sf_sale/models/auto_quatotion_common.py

@@ -2,7 +2,7 @@
 import logging
 from odoo.modules import get_resource_path
 from odoo import fields, models, api
-from quatotion import readSql, feature_recognize, auto_quatotion
+# from quatotion import readSql, feature_recognize, auto_quatotion
 
 __author__ = 'jinling.yang'
 _logger = logging.getLogger(__name__)

sf_sale/models/quick_easy_order.py

@@ -5,9 +5,13 @@ import os
 import platform
 import json
 from datetime import datetime
+<<<<<<< HEAD
+# import requests
+=======
 import requests
 from odoo import http
 from odoo.http import request
+>>>>>>> 8695a66e3d9be860f778caba8db5500885f4548f
 # from OCC.Extend.DataExchange import read_step_file
 # from OCC.Extend.DataExchange import write_stl_file
 from odoo import models, fields, api

sf_sale/models/sale_order.py

@@ -173,6 +173,11 @@ class RePurchaseOrder(models.Model):
         return super().write(vals)
 
     def button_confirm(self):
+<<<<<<< HEAD
+        self.check_status = 'pending'
+        res = super().button_confirm()
+        return res
+=======
         for order in self:
             if order.state not in ['draft', 'sent', 'purchase']:
                 continue
@@ -186,6 +191,7 @@ class RePurchaseOrder(models.Model):
             if order.partner_id not in order.message_partner_ids:
                 order.message_subscribe([order.partner_id.id])
         return True
+>>>>>>> 8695a66e3d9be860f778caba8db5500885f4548f
 
 
 class ResPartnerToSale(models.Model):

sf_sale/views/purchase_order_view.xml

@@ -133,15 +133,23 @@
             </field>
         </record>
 
+<<<<<<< HEAD
+        <record id="purchase_order_view_tree_inherit_sf" model="ir.ui.view">
+=======
         <record id="view_purchase_order_view_tree_inherit_sf" model="ir.ui.view">
+>>>>>>> 8695a66e3d9be860f778caba8db5500885f4548f
             <field name="name">purchase.order.tree.inherit.sf</field>
             <field name="model">purchase.order</field>
             <field name="inherit_id" ref="purchase.purchase_order_view_tree"/>
             <field name="arch" type="xml">
+<<<<<<< HEAD
+                <field name="invoice_status" position="after">
+=======
                 <tree position="attributes">
                     <attribute name="default_order">check_status desc,date_approve asc</attribute>
                 </tree>
                 <field name="amount_total" position="after">
+>>>>>>> 8695a66e3d9be860f778caba8db5500885f4548f
                     <field name="check_status" widget="badge"
                            decoration-success="check_status == 'approved'"
                            decoration-warning="check_status == 'pending'"