Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug

# Conflicts:
#	sf_manufacturing/models/product_template.py

sf_base/models/tool_base_new.py

@@ -243,3 +243,12 @@ class MaintenanceStandardImage(models.Model):
             else:
                 record['image'] = ""
         return records
+
+
+class ToolGroups(models.Model):
+    _name = 'sf.tool.groups'
+    _description = '刀具组'
+
+    name = fields.Char('名称')
+    equipment_ids = fields.Many2many('maintenance.equipment', 'ref_maintenance_equipment', string='机台号')
+    remark = fields.Char('备注', size=50)

sf_base/security/ir.model.access.csv

@@ -28,6 +28,7 @@ access_sf_sync_common,sf_sync_common,model_sf_sync_common,base.group_user,1,1,1,
 access_sf_international_standards,sf_international_standards,model_sf_international_standards,base.group_user,1,1,1,1
 access_material_apply,material_apply,model_material_apply,base.group_user,1,1,1,1
 access_sf_cutting_tool_standard_library,sf_cutting_tool_standard_library,model_sf_cutting_tool_standard_library,base.group_user,1,1,1,1
+access_sf_tool_groups,sf_tool_groups,model_sf_tool_groups,base.group_user,1,1,1,1
 access_sf_tool_materials_basic_parameters,sf_tool_materials_basic_parameters,model_sf_tool_materials_basic_parameters,base.group_user,1,1,1,1
 access_sf_cutting_speed,sf_cutting_speed,model_sf_cutting_speed,base.group_user,1,1,1,1
 access_sf_feed_per_tooth,sf_feed_per_tooth,model_sf_feed_per_tooth,base.group_user,1,1,1,1

sf_base/views/tool_menu.xml

@@ -92,5 +92,12 @@
             action="action_maintenance_equipment_image"
             sequence="5"/>
 
+        <menuitem
+            id="menu_sf_tool_groups"
+            name="刀具组"
+            parent="menu_sf_cutting_tool"
+            action="sf_tool_groups_view_act"
+            sequence="10"/>
+
     </data>
 </odoo>

sf_base/views/tool_views.xml

@@ -490,6 +490,28 @@
         <field name="domain">[]</field>
     </record>
 
+    <!-- ================================================刀具组================================================ -->
+    <record id="sf_tool_groups_tree" model="ir.ui.view">
+        <field name="name">刀具组</field>
+        <field name="model">sf.tool.groups</field>
+        <field name="arch" type="xml">
+            <tree create="1" edit="1" delete="1" editable="bottom">
+                <field name="name"/>
+                <field name="equipment_ids" widget="many2many_tags"/>
+                <field name="remark"/>
+                <field name="create_uid" string="创建人"/>
+                <field name="create_date" string="创建时间"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="sf_tool_groups_view_act" model="ir.actions.act_window">
+        <field name="name">刀具组</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">sf.tool.groups</field>
+        <field name="view_mode">tree,form,search</field>
+    </record>
+
     <!-- ================================================刀具基础参数================================================ -->
     <!--    <record id="view_sf_tool_materials_basic_parameters_tree" model="ir.ui.view">-->
     <!--        <field name="name">sf.tool.materials.basic.parameters.tree</field>-->