Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop

# Conflicts:
#	sf_tool_management/__init__.py
#	sf_tool_management/models/base.py

sf_base/security/group_security.xml

@@ -60,7 +60,6 @@
         <record id="group_sale_director" model="res.groups">
             <field name="name">销售总监</field>
             <field name="category_id" ref="base.module_category_sales_sales"/>
-            <field name="implied_ids" eval="[(4, ref('sf_base.group_sale_salemanager'))]"/>
         </record>
 
         <record id="group_plan_dispatch" model="res.groups">
@@ -72,7 +71,7 @@
         <record id="group_plan_director" model="res.groups">
             <field name="name">计划总监</field>
             <field name="category_id" ref="module_category_plan"/>
-            <field name="implied_ids" eval="[(4, ref('sf_base.group_plan_dispatch'))]"/>
+<!--            <field name="implied_ids" eval="[(4, ref('sf_base.group_plan_dispatch'))]"/>-->
         </record>
 
         <record id="group_purchase" model="res.groups">

sf_quality/security/ir.model.access.csv

@@ -39,5 +39,16 @@ access_quality_alert_team_group_sf_tool_user,quality_alert_team_group_sf_tool_us
 access_quality_alert_team_group_sf_order_user,quality_alert_team_group_sf_order_user,quality.model_quality_alert_team,sf_base.group_sf_order_user,1,0,0,0
 access_quality_alert_team_group_sf_mrp_manager,quality_alert_team_group_sf_mrp_manager,quality.model_quality_alert_team,sf_base.group_sf_mrp_manager,1,0,0,0
 
+access_product_template_group_quality,product_template_group_quality,product.model_product_template,sf_base.group_quality,1,0,0,0
+access_product_template_group_quality_director,product_template_group_quality_director,product.model_product_template,sf_base.group_quality_director,1,0,0,0
+access_product_template_group_plan_dispatch,product_template_group_plan_dispatch,product.model_product_template,sf_base.group_plan_dispatch,1,0,0,0
+access_product_template_group_plan_director,product_template_group_plan_director,product.model_product_template,sf_base.group_plan_director,1,0,0,0
+access_product_template_group_sf_equipment_user,product_template_group_sf_equipment_user,product.model_product_template,sf_base.group_sf_equipment_user,1,0,0,0
+access_product_template_group_sf_tool_user,product_template_group_sf_tool_user,product.model_product_template,sf_base.group_sf_tool_user,1,0,0,0
+access_product_template_group_sf_order_user,product_template_group_sf_order_user,product.model_product_template,sf_base.group_sf_order_user,1,0,0,0
+access_product_template_group_sf_mrp_manager,product_template_group_sf_mrp_manager,product.model_product_template,sf_base.group_sf_mrp_manager,1,0,0,0
+access_product_template_group_equipment_user,product_template_group_equipment_user,product.model_product_template,sf_maintenance.sf_group_equipment_user,1,0,0,0
+access_product_template_group_equipment_manager,product_template_group_equipment_manager,product.model_product_template,sf_maintenance.sf_group_equipment_manager,1,0,0,0
+
 
 

sf_tool_management/__init__.py

@@ -1,20 +1,18 @@
 # -*-coding:utf-8-*-
 from . import models
 from . import wizard
+from odoo import api, SUPERUSER_ID
+import logging
 
-# from odoo import api, SUPERUSER_ID
-# import logging
-# _logger = logging.getLogger(__name__)
-#
-#
-# def _sf_tool_management_post_install(cr, registry):
-#     # 这里执行你想要在安装模块时执行的操作，包括调用和执行模型的方法
-#     env = api.Environment(cr, SUPERUSER_ID, {})
-#
-#     # 获取需要执行方法的模型
-#     model_obj = env['sf.machine.table.tool.changing.apply']
-#     logging.info('post_install方法执行了')
-#     print('post_install方法执行了')
-#
-#     # 调用模型方法
-#     model_obj.create_tool_change_application()
+_logger = logging.getLogger(__name__)
+
+
+def _post_install(cr, registry):
+    # 这里执行你想要在安装模块时执行的操作，包括调用和执行模型的方法
+    env = api.Environment(cr, SUPERUSER_ID, {})
+
+    # 获取需要执行方法的模型
+    model_obj = env['sf.machine.table.tool.changing.apply']
+
+    # 调用模型方法
+    model_obj.create_tool_change_application()

sf_tool_management/__manifest__.py

@@ -21,6 +21,7 @@
     ],
     'demo': [
     ],
+    'post_init_hook': '_post_install',
     'assets': {
 
         'web.assets_qweb': [

sf_tool_management/models/base.py

@@ -477,7 +477,17 @@ class MachineTableToolChangingApply(models.Model):
             [('name', '=', self.name.id)]).write({'status': '0'})
 
     def create_tool_change_application(self):
-        print("调用了create_tool_change_application()")
+        maintenance_equipment_ids = self.env['maintenance.equipment'].sudo().search(
+            [('product_template_ids', '!=', False)])
+        tool_changing_apply = self.env['sf.machine.table.tool.changing.apply']
+        if maintenance_equipment_ids:
+            for maintenance_equipment_id in maintenance_equipment_ids:
+                if maintenance_equipment_id.product_template_ids:
+                    for product_template_id in maintenance_equipment_id.product_template_ids:
+                        tool_changing_apply.sudo().create({
+                            'maintenance_equipment_id': product_template_id.equipment_id.id,
+                            'cutter_spacing_code_id': product_template_id.id
+                        })
 
 
 class CAMWorkOrderProgramKnifePlan(models.Model):