Accept Merge Request #748: (feature/制造代码优化 -> develop)

Merge Request: 代码优化,权限问题修复

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/748
This commit is contained in:
马广威
2024-01-05 10:29:32 +08:00
committed by Coding
4 changed files with 31 additions and 9 deletions

View File

@@ -10,6 +10,7 @@
'data': [ 'data': [
'security/group_security.xml', 'security/group_security.xml',
'security/ir.model.access.csv', 'security/ir.model.access.csv',
'security/ir_rule_data.xml',
'views/maintenance_logs_views.xml', 'views/maintenance_logs_views.xml',
'views/maintenance_views.xml', 'views/maintenance_views.xml',
'views/equipment_maintenance_standards_views.xml', 'views/equipment_maintenance_standards_views.xml',

View File

@@ -7,8 +7,12 @@ access_maintenance_standard_image,maintenance_standard_image,model_maintenance_s
access_sf_robot_axis_num,sf_robot_axis_num,model_sf_robot_axis_num,sf_group_equipment_user,1,1,1,1 access_sf_robot_axis_num,sf_robot_axis_num,model_sf_robot_axis_num,sf_group_equipment_user,1,1,1,1
access_maintenance_request,maintenance.request,maintenance.model_maintenance_request,sf_base.group_plan_dispatch,1,0,0,0 access_maintenance_request_group_plan_dispatch,maintenance.request,maintenance.model_maintenance_request,sf_base.group_plan_dispatch,1,0,0,0
access_maintenance_equipment,maintenance_equipment,model_maintenance_equipment,sf_base.group_plan_dispatch,1,0,0,0 access_maintenance_equipment_group_plan_dispatch,maintenance.equipment,maintenance.model_maintenance_equipment,sf_base.group_plan_dispatch,1,1,1,1
access_sf_maintenance_logs,sf_maintenance_logs,model_sf_maintenance_logs,sf_base.group_plan_dispatch,1,0,0,0 access_sf_maintenance_logs_group_plan_dispatch,sf_maintenance_logs,model_sf_maintenance_logs,sf_base.group_plan_dispatch,1,0,0,0
access_maintenance_standard_image,maintenance_standard_image,model_maintenance_standard_image,sf_base.group_plan_dispatch,1,0,0,0 access_maintenance_standard_image_group_plan_dispatch,maintenance_standard_image,model_maintenance_standard_image,sf_base.group_plan_dispatch,1,0,0,0
access_equipment_maintenance_standards,equipment_maintenance_standards,model_equipment_maintenance_standards,sf_base.group_plan_dispatch,1,0,0,0 access_equipment_maintenance_standards_group_plan_dispatch,equipment_maintenance_standards,model_equipment_maintenance_standards,sf_base.group_plan_dispatch,1,0,0,0
access_maintenance_standards_group_plan_dispatch,maintenance_standards,model_maintenance_standards,sf_base.group_plan_dispatch,1,0,0,0
access_maintenance_equipment_tool_group_plan_dispatch,maintenance.equipment.tool,sf_manufacturing.model_maintenance_equipment_tool,sf_base.group_plan_dispatch,1,0,0,0
access_sf_robot_axis_num_group_plan_dispatch,sf.robot.axis.num,model_sf_robot_axis_num,sf_base.group_plan_dispatch,1,0,0,0
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
7 access_sf_robot_axis_num sf_robot_axis_num model_sf_robot_axis_num sf_group_equipment_user 1 1 1 1
8 access_maintenance_request access_maintenance_request_group_plan_dispatch maintenance.request maintenance.model_maintenance_request sf_base.group_plan_dispatch 1 0 0 0
9 access_maintenance_equipment access_maintenance_equipment_group_plan_dispatch maintenance_equipment maintenance.equipment model_maintenance_equipment maintenance.model_maintenance_equipment sf_base.group_plan_dispatch 1 0 1 0 1 0 1
10 access_sf_maintenance_logs access_sf_maintenance_logs_group_plan_dispatch sf_maintenance_logs model_sf_maintenance_logs sf_base.group_plan_dispatch 1 0 0 0
11 access_maintenance_standard_image access_maintenance_standard_image_group_plan_dispatch maintenance_standard_image model_maintenance_standard_image sf_base.group_plan_dispatch 1 0 0 0
12 access_equipment_maintenance_standards access_equipment_maintenance_standards_group_plan_dispatch equipment_maintenance_standards model_equipment_maintenance_standards sf_base.group_plan_dispatch 1 0 0 0
13 access_maintenance_standards_group_plan_dispatch maintenance_standards model_maintenance_standards sf_base.group_plan_dispatch 1 0 0 0
14 access_maintenance_equipment_tool_group_plan_dispatch maintenance.equipment.tool sf_manufacturing.model_maintenance_equipment_tool sf_base.group_plan_dispatch 1 0 0 0
15 access_sf_robot_axis_num_group_plan_dispatch sf.robot.axis.num model_sf_robot_axis_num sf_base.group_plan_dispatch 1 0 0 0
16
17
18

View File

@@ -0,0 +1,15 @@
<odoo>
<data> <!-- 如果您不希望在模块更新时重置规则,则设置 noupdate="1" -->
<!-- 计划调度岗 规则 -->
<record id="maintenance_equipment_rule_plan_dispatch" model="ir.rule">
<field name="name">Maintenance Equipment Plan Dispatch Rule</field>
<field name="model_id" ref="maintenance.model_maintenance_equipment"/>
<field name="groups" eval="[(4, ref('sf_base.group_plan_dispatch'))]"/>
<!-- <field name="domain_force">['|',('user_id','=',user.id),('user_id','=',False)]</field> -->
<field name="perm_read">True</field>
<field name="perm_write">False</field>
<field name="perm_create">False</field>
<field name="perm_unlink">False</field>
</record>
</data>
</odoo>

View File

@@ -1,4 +1,5 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_sf_shelf_location,sf.shelf.location,model_sf_shelf_location,sf_warehouse.group_sf_stock_user,1,1,1,0 access_sf_shelf_location,sf.shelf.location,model_sf_shelf_location,sf_warehouse.group_sf_stock_user,1,1,1,0
access_procurement_group,procurement.group,stock.model_procurement_group,base.group_user,1,1,1,0 access_procurement_group,procurement.group,stock.model_procurement_group,base.group_user,1,1,1,0
@@ -95,14 +96,15 @@ access_stock_lot_label_layout_user,lot.label.layout.user,stock.model_lot_label_l
access_stock_replenish_option,stock.replenishment.option,stock.model_stock_replenishment_option,sf_warehouse.group_sf_stock_user,1,1,1,0 access_stock_replenish_option,stock.replenishment.option,stock.model_stock_replenishment_option,sf_warehouse.group_sf_stock_user,1,1,1,0
access_mrp_production,mrp.production,mrp.model_mrp_production,sf_warehouse.group_sf_stock_user,1,1,1,0 access_mrp_production,mrp.production,mrp.model_mrp_production,sf_warehouse.group_sf_stock_user,1,1,1,0
access_sf_shelf_location,sf.shelf.location,model_sf_shelf_location,sf_base.group_plan_dispatch,1,0,0,0 access_sf_shelf_location_group_plan_dispatch,sf.shelf.location,model_sf_shelf_location,sf_base.group_plan_dispatch,1,1,0,0
access_stock_move,stock.move,stock.model_stock_move,sf_base.group_plan_dispatch,1,1,1,0 access_stock_move,stock.move,stock.model_stock_move,sf_base.group_plan_dispatch,1,1,1,0
access_stock_scrap_user,stock.scrap.user,stock.model_stock_scrap,sf_base.group_plan_dispatch,1,0,0,0 access_stock_scrap_user,stock.scrap.user,stock.model_stock_scrap,sf_base.group_plan_dispatch,1,0,0,0
access_stock_scrap_manager,stock.scrap.manager,stock.model_stock_scrap,sf_base.group_plan_dispatch,1,0,0,0 access_stock_scrap_manager,stock.scrap.manager,stock.model_stock_scrap,sf_base.group_plan_dispatch,1,0,0,0
access_stock_picking,stock.picking,stock.model_stock_picking,sf_base.group_plan_dispatch,1,0,0,0 access_stock_picking,stock.picking,stock.model_stock_picking,sf_base.group_plan_dispatch,1,0,0,0
access_stock_lot,stock.lot,stock.model_stock_lot,sf_base.group_plan_dispatch,1,1,1,0 access_stock_lot_group_plan_dispatch,stock.lot,stock.model_stock_lot,sf_base.group_plan_dispatch,1,0,0,0
access_stock_warehouse_orderpoint,stock.warehouse.orderpoint,stock.model_stock_warehouse_orderpoint,sf_base.group_plan_dispatch,1,0,0,0 access_stock_lot_group_plan_director,stock.lot,stock.model_stock_lot,sf_base.group_plan_director,1,1,1,0
access_stock_quant,stock.quant,stock.model_stock_quant,sf_base.group_plan_dispatch,1,0,0,0 access_stock_warehouse_orderpoint,stock.warehouse.orderpoint,stock.model_stock_warehouse_orderpoint,sf_base.group_plan_dispatch,1,1,0,0
access_stock_quant,stock.quant,stock.model_stock_quant,sf_base.group_plan_dispatch,1,1,1,0
access_product_product,product.product,product.model_product_product,sf_base.group_plan_dispatch,1,0,0,0 access_product_product,product.product,product.model_product_product,sf_base.group_plan_dispatch,1,0,0,0
access_product_template,product.template,product.model_product_template,sf_base.group_plan_dispatch,1,0,0,0 access_product_template,product.template,product.model_product_template,sf_base.group_plan_dispatch,1,0,0,0
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_sf_shelf_location sf.shelf.location model_sf_shelf_location sf_warehouse.group_sf_stock_user 1 1 1 0
3 access_sf_shelf_location access_procurement_group sf.shelf.location procurement.group model_sf_shelf_location stock.model_procurement_group sf_warehouse.group_sf_stock_user base.group_user 1 1 1 0
4 access_procurement_group access_stock_warehouse_manager procurement.group stock.warehouse.manager stock.model_procurement_group stock.model_stock_warehouse base.group_user sf_warehouse.group_sf_stock_user 1 1 1 0
5 access_stock_warehouse_manager access_stock_warehouse_user stock.warehouse.manager stock.warehouse.user stock.model_stock_warehouse sf_warehouse.group_sf_stock_user base.group_user 1 1 0 1 0 0
96 access_mrp_production access_sf_shelf_location_group_plan_dispatch mrp.production sf.shelf.location mrp.model_mrp_production model_sf_shelf_location sf_warehouse.group_sf_stock_user sf_base.group_plan_dispatch 1 1 1 0 0
97 access_sf_shelf_location access_stock_move sf.shelf.location stock.move model_sf_shelf_location stock.model_stock_move sf_base.group_plan_dispatch 1 0 1 0 1 0
98 access_stock_move access_stock_scrap_user stock.move stock.scrap.user stock.model_stock_move stock.model_stock_scrap sf_base.group_plan_dispatch 1 1 0 1 0 0
99 access_stock_scrap_user access_stock_scrap_manager stock.scrap.user stock.scrap.manager stock.model_stock_scrap sf_base.group_plan_dispatch 1 0 0 0
100 access_stock_scrap_manager access_stock_picking stock.scrap.manager stock.picking stock.model_stock_scrap stock.model_stock_picking sf_base.group_plan_dispatch 1 0 0 0
101 access_stock_picking access_stock_lot_group_plan_dispatch stock.picking stock.lot stock.model_stock_picking stock.model_stock_lot sf_base.group_plan_dispatch 1 0 0 0
102 access_stock_lot access_stock_lot_group_plan_director stock.lot stock.model_stock_lot sf_base.group_plan_dispatch sf_base.group_plan_director 1 1 1 0
103 access_stock_warehouse_orderpoint stock.warehouse.orderpoint stock.model_stock_warehouse_orderpoint sf_base.group_plan_dispatch 1 0 1 0 0
104 access_stock_quant stock.quant stock.model_stock_quant sf_base.group_plan_dispatch 1 0 1 0 1 0
105 access_product_product product.product product.model_product_product sf_base.group_plan_dispatch 1 0 0 0
106 access_product_template product.template product.model_product_template sf_base.group_plan_dispatch 1 0 0 0
107 access_product_product product.product product.model_product_product sf_base.group_plan_director 1 1 1 0
108 access_product_product access_product_template product.product product.template product.model_product_product product.model_product_template sf_base.group_plan_director 1 1 1 0
109 access_product_template access_stock_inventory_conflict product.template stock.inventory.conflict product.model_product_template stock.model_stock_inventory_conflict sf_base.group_plan_director sf_base.group_plan_dispatch 1 1 0 1 0 0
110 access_stock_inventory_conflict access_stock_inventory_warning stock.inventory.conflict stock.inventory.warning stock.model_stock_inventory_conflict stock.model_stock_inventory_warning sf_base.group_plan_dispatch 1 0 0 0