jikimo/jikimo_sf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept Merge Request #892: (feature/修改机床参数bug -> develop)

Browse Source 
Merge Request: 删除工序，加工工艺对象，新增表面工艺可选参数对象

Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/892
This commit is contained in:
龚启豪
2024-03-12 09:48:23 +08:00
committed by Coding
parent e3b8b0a43d b315f4b3fe
commit 26942afc27
8 changed files with 232 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sf_base/security/ir.model.access.csv
View File

@@ -9,16 +9,13 @@ access_sf_machine_brand_tags,sf_machine_brand_tags,model_sf_machine_brand_tags,b
access_sf_machine_brand_tags_admin,sf_machine_brand_tags_admin,model_sf_machine_brand_tags,base.group_system,1,1,1,0
access_sf_machine_control_system,sf_machine_control_system,model_sf_machine_control_system,base.group_user,1,1,1,0
access_sf_machine_control_system_admin,sf_machine_control_system_admin,model_sf_machine_control_system,base.group_system,1,1,1,0
access_sf_processing_order,sf_processing_order,model_sf_processing_order,base.group_user,1,1,1,0
access_sf_processing_order_admin,sf_processing_order_admin,model_sf_processing_order,base.group_system,1,1,1,0
access_sf_production_process,sf_production_process,model_sf_production_process,base.group_user,1,1,1,0
access_sf_production_process_admin,sf_production_process_admin,model_sf_production_process,base.group_system,1,1,1,0
access_sf_production_materials,sf_production_materials,model_sf_production_materials,base.group_user,1,1,1,0
access_sf_production_materials_admin,sf_production_materials_admin,model_sf_production_materials,base.group_system,1,1,1,0
access_sf_materials_model,sf_materials_model,model_sf_materials_model,base.group_user,1,1,1,0
access_sf_materials_model_admin,sf_materials_model_admin,model_sf_materials_model,base.group_system,1,1,1,0
access_sf_processing_technology,sf_processing_technology,model_sf_processing_technology,base.group_user,1,1,1,0
access_sf_processing_technology_admin,sf_processing_technology_admin,model_sf_processing_technology,base.group_system,1,1,1,0
access_sf_supplier_sort,sf_supplier_sort,model_sf_supplier_sort,base.group_user,1,1,1,0
access_sf_supplier_sort_admin,sf_supplier_sort_admin,model_sf_supplier_sort,base.group_system,1,1,1,0
access_sf_production_process_parameter,sf_production_process_parameter,model_sf_production_process_parameter,base.group_user,1,1,1,0
@@ -94,7 +91,6 @@ access_sf_machine_brand_group_purchase_director,sf_machine_brand_group_purchase_
access_sf_machine_brand_group_sale_director,sf_machine_brand_group_sale_director,model_sf_machine_brand,sf_base.group_sale_director,1,0,0,0
access_sf_machine_brand_tags,sf_machine_brand_tags,model_sf_machine_brand_tags,base.group_user,1,1,1,1
access_sf_machine_control_system,sf_machine_control_system,model_sf_machine_control_system,sf_base.group_sf_mrp_user,1,0,0,0
access_sf_processing_order,sf_processing_order,model_sf_processing_order,sf_base.group_sf_mrp_user,1,0,0,0
access_sf_production_process,sf_production_process,model_sf_production_process,sf_base.group_sf_mrp_user,1,0,0,0
access_sf_production_materials,sf_production_materials,model_sf_production_materials,sf_base.group_sf_mrp_user,1,0,0,0
access_sf_production_materials_group_plan_director,sf_production_materials_group_plan_director,model_sf_production_materials,sf_base.group_plan_director,1,1,0,0
@@ -104,7 +100,6 @@ access_sf_materials_model,sf_materials_model,model_sf_materials_model,sf_base.gr
access_sf_materials_model_group_plan_director,sf_materials_model_group_plan_director,model_sf_materials_model,sf_base.group_plan_director,1,0,0,0
access_sf_materials_model_group_purchase_director,sf_materials_model_group_purchase_director,model_sf_materials_model,sf_base.group_purchase_director,1,0,0,0
access_sf_materials_model_group_sale_director,sf_materials_model_group_sale_director,model_sf_materials_model,sf_base.group_sale_director,1,0,0,0
access_sf_processing_technology,sf_processing_technology,model_sf_processing_technology,sf_base.group_sf_mrp_user,1,0,0,0
access_sf_supplier_sort,sf_supplier_sort,model_sf_supplier_sort,sf_base.group_sf_mrp_user,1,0,0,0
access_sf_production_process_parameter,sf_production_process_parameter,model_sf_production_process_parameter,sf_base.group_sf_mrp_user,1,0,0,0
access_sf_production_process_category,sf_production_process_category,model_sf_production_process_category,sf_base.group_sf_mrp_user,1,0,0,0
@@ -161,11 +156,9 @@ access_sf_machine_tool_type,sf_machine_tool_type,model_sf_machine_tool_type,sf_b
access_sf_machine_brand,sf_machine_brand,model_sf_machine_brand,sf_base.group_sf_mrp_user,1,1,0,0
access_sf_machine_brand_tags,sf_machine_brand_tags,model_sf_machine_brand_tags,sf_base.group_sf_mrp_user,1,1,0,0
access_sf_machine_control_system,sf_machine_control_system,model_sf_machine_control_system,sf_base.group_sf_mrp_user,1,1,0,0
access_sf_processing_order,sf_processing_order,model_sf_processing_order,sf_base.group_sf_mrp_user,1,1,0,0
access_sf_production_process,sf_production_process,model_sf_production_process,sf_base.group_sf_mrp_user,1,1,0,0
access_sf_production_materials,sf_production_materials,model_sf_production_materials,sf_base.group_sf_mrp_user,1,1,0,0
access_sf_materials_model,sf_materials_model,model_sf_materials_model,sf_base.group_sf_mrp_user,1,1,0,0
access_sf_processing_technology,sf_processing_technology,model_sf_processing_technology,sf_base.group_sf_mrp_user,1,1,0,0
access_sf_supplier_sort,sf_supplier_sort,model_sf_supplier_sort,sf_base.group_sf_mrp_user,1,1,0,0
access_sf_production_process_parameter,sf_production_process_parameter,model_sf_production_process_parameter,sf_base.group_sf_mrp_user,1,1,0,0
access_sf_production_process_category,sf_production_process_category,model_sf_production_process_category,sf_base.group_sf_mrp_user,1,1,0,0
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
9 access_sf_machine_brand_tags_admin sf_machine_brand_tags_admin model_sf_machine_brand_tags base.group_system 1 1 1 0
10 access_sf_machine_control_system sf_machine_control_system model_sf_machine_control_system base.group_user 1 1 1 0
11 access_sf_machine_control_system_admin sf_machine_control_system_admin model_sf_machine_control_system base.group_system 1 1 1 0
12 access_sf_processing_order access_sf_production_process sf_processing_order sf_production_process model_sf_processing_order model_sf_production_process base.group_user 1 1 1 0
access_sf_processing_order_admin sf_processing_order_admin model_sf_processing_order base.group_system 1 1 1 0
13 access_sf_production_process access_sf_production_process_admin sf_production_process sf_production_process_admin model_sf_production_process base.group_user base.group_system 1 1 1 0
14 access_sf_production_process_admin access_sf_production_materials sf_production_process_admin sf_production_materials model_sf_production_process model_sf_production_materials base.group_system base.group_user 1 1 1 0
15 access_sf_production_materials access_sf_production_materials_admin sf_production_materials sf_production_materials_admin model_sf_production_materials base.group_user base.group_system 1 1 1 0
16 access_sf_production_materials_admin access_sf_materials_model sf_production_materials_admin sf_materials_model model_sf_production_materials model_sf_materials_model base.group_system base.group_user 1 1 1 0
17 access_sf_materials_model access_sf_materials_model_admin sf_materials_model sf_materials_model_admin model_sf_materials_model base.group_user base.group_system 1 1 1 0
18 access_sf_materials_model_admin access_sf_supplier_sort sf_materials_model_admin sf_supplier_sort model_sf_materials_model model_sf_supplier_sort base.group_system base.group_user 1 1 1 0
access_sf_processing_technology sf_processing_technology model_sf_processing_technology base.group_user 1 1 1 0
access_sf_processing_technology_admin sf_processing_technology_admin model_sf_processing_technology base.group_system 1 1 1 0
19 access_sf_supplier_sort access_sf_supplier_sort_admin sf_supplier_sort sf_supplier_sort_admin model_sf_supplier_sort base.group_user base.group_system 1 1 1 0
20 access_sf_supplier_sort_admin access_sf_production_process_parameter sf_supplier_sort_admin sf_production_process_parameter model_sf_supplier_sort model_sf_production_process_parameter base.group_system base.group_user 1 1 1 0
21 access_sf_production_process_parameter access_sf_production_process_parameter_group_plan_director sf_production_process_parameter sf_production_process_parameter_group_plan_director model_sf_production_process_parameter base.group_user sf_base.group_plan_director 1 1 0 1 0 0
91 access_sf_machine_brand_tags access_sf_machine_control_system sf_machine_brand_tags sf_machine_control_system model_sf_machine_brand_tags model_sf_machine_control_system base.group_user sf_base.group_sf_mrp_user 1 1 0 1 0 1 0
92 access_sf_machine_control_system access_sf_production_process sf_machine_control_system sf_production_process model_sf_machine_control_system model_sf_production_process sf_base.group_sf_mrp_user 1 0 0 0
93 access_sf_processing_order access_sf_production_materials sf_processing_order sf_production_materials model_sf_processing_order model_sf_production_materials sf_base.group_sf_mrp_user 1 0 0 0
access_sf_production_process sf_production_process model_sf_production_process sf_base.group_sf_mrp_user 1 0 0 0
94 access_sf_production_materials access_sf_production_materials_group_plan_director sf_production_materials sf_production_materials_group_plan_director model_sf_production_materials sf_base.group_sf_mrp_user sf_base.group_plan_director 1 0 1 0 0
95 access_sf_production_materials_group_plan_director access_sf_production_materials_group_purchase_director sf_production_materials_group_plan_director sf_production_materials_group_purchase_director model_sf_production_materials sf_base.group_plan_director sf_base.group_purchase_director 1 1 0 0
96 access_sf_production_materials_group_purchase_director access_sf_production_materials_group_sale_director sf_production_materials_group_purchase_director sf_production_materials_group_sale_director model_sf_production_materials sf_base.group_purchase_director sf_base.group_sale_director 1 1 0 0
100 access_sf_materials_model_group_purchase_director access_sf_materials_model_group_sale_director sf_materials_model_group_purchase_director sf_materials_model_group_sale_director model_sf_materials_model sf_base.group_purchase_director sf_base.group_sale_director 1 0 0 0
101 access_sf_materials_model_group_sale_director access_sf_supplier_sort sf_materials_model_group_sale_director sf_supplier_sort model_sf_materials_model model_sf_supplier_sort sf_base.group_sale_director sf_base.group_sf_mrp_user 1 0 0 0
102 access_sf_processing_technology access_sf_production_process_parameter sf_processing_technology sf_production_process_parameter model_sf_processing_technology model_sf_production_process_parameter sf_base.group_sf_mrp_user 1 0 0 0
access_sf_supplier_sort sf_supplier_sort model_sf_supplier_sort sf_base.group_sf_mrp_user 1 0 0 0
103 access_sf_production_process_parameter access_sf_production_process_category sf_production_process_parameter sf_production_process_category model_sf_production_process_parameter model_sf_production_process_category sf_base.group_sf_mrp_user 1 0 0 0
104 access_sf_production_process_category access_sf_machine_tool_category sf_production_process_category sf_machine_tool_category model_sf_production_process_category model_sf_machine_tool_category sf_base.group_sf_mrp_user 1 0 0 0
105 access_sf_machine_tool_category access_sf_cutting_tool_material_group_purchase_director sf_machine_tool_category sf_cutting_tool_material_group_purchase_director model_sf_machine_tool_category model_sf_cutting_tool_material sf_base.group_sf_mrp_user sf_base.group_purchase_director 1 0 0 1 0
156 access_sf_processing_order access_sf_production_materials sf_processing_order sf_production_materials model_sf_processing_order model_sf_production_materials sf_base.group_sf_mrp_user 1 1 0 0
157 access_sf_production_process access_sf_materials_model sf_production_process sf_materials_model model_sf_production_process model_sf_materials_model sf_base.group_sf_mrp_user 1 1 0 0
158 access_sf_production_materials access_sf_supplier_sort sf_production_materials sf_supplier_sort model_sf_production_materials model_sf_supplier_sort sf_base.group_sf_mrp_user 1 1 0 0
access_sf_materials_model sf_materials_model model_sf_materials_model sf_base.group_sf_mrp_user 1 1 0 0
159 access_sf_processing_technology access_sf_production_process_parameter sf_processing_technology sf_production_process_parameter model_sf_processing_technology model_sf_production_process_parameter sf_base.group_sf_mrp_user 1 1 0 0
160 access_sf_supplier_sort access_sf_production_process_category sf_supplier_sort sf_production_process_category model_sf_supplier_sort model_sf_production_process_category sf_base.group_sf_mrp_user 1 1 0 0
161 access_sf_production_process_parameter access_sf_machine_tool_category sf_production_process_parameter sf_machine_tool_category model_sf_production_process_parameter model_sf_machine_tool_category sf_base.group_sf_mrp_user 1 1 0 0
access_sf_production_process_category sf_production_process_category model_sf_production_process_category sf_base.group_sf_mrp_user 1 1 0 0
162 access_sf_machine_tool_category access_sf_cutting_tool_material sf_machine_tool_category sf_cutting_tool_material model_sf_machine_tool_category model_sf_cutting_tool_material sf_base.group_sf_mrp_user 1 1 0 0
163 access_sf_cutting_tool_material access_sf_cutting_tool_type sf_cutting_tool_material sf_cutting_tool_type model_sf_cutting_tool_material model_sf_cutting_tool_type sf_base.group_sf_mrp_user 1 1 0 0
164 access_sf_cutting_tool_type access_sf_functional_cutting_tool sf_cutting_tool_type sf_functional_cutting_tool model_sf_cutting_tool_type model_sf_functional_cutting_tool sf_base.group_sf_mrp_user 1 1 0 0