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

处理冲突

Browse Source
This commit is contained in:
qihao.gong@jikimo.com
2023-06-16 10:02:33 +08:00
parent e9ad452c43
commit 018fecfc59
25 changed files with 2855 additions and 905 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,8 +1,6 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_sf_machine_tool,sf_machine_tool,model_sf_machine_tool,base.group_user,1,1,1,1
access_sf_cutting_tool_category,sf_cutting_tool_category,model_sf_cutting_tool_category,base.group_user,1,1,1,1
access_sf_machine_tool_type,sf_machine_tool_type,model_sf_machine_tool_type,base.group_user,1,1,1,1
access_sf_cutting_tool_type,sf_cutting_tool_type,model_sf_cutting_tool_type,base.group_user,1,1,1,1
access_sf_machine_brand,sf_machine_brand,model_sf_machine_brand,base.group_user,1,1,1,1
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,base.group_user,1,1,1,1
@@ -31,8 +29,20 @@ access_sf_handle,sf.handle,model_sf_handle,base.group_user,1,1,1,1
access_sf_handle_model,sf.handle.model,model_sf_handle_model,base.group_user,1,1,1,1
access_sf_chuck,sf.chuck,model_sf_chuck,base.group_user,1,1,1,1
access_sf_chuck_model,sf.chuck.model,model_sf_chuck_model,base.group_user,1,1,1,1
access_sf_cutting_tool_material,sf.cutting.tool.material,model_sf_cutting_tool_material,base.group_user,1,1,1,1
access_sf_fixture_setting_element,sf_fixture_setting_element,model_sf_fixture_setting_element,base.group_user,1,1,1,1
access_sf_setting_element_type,sf_setting_element_type,model_sf_setting_element_type,base.group_user,1,1,1,1
access_sf_fixture_clamping_element,sf_fixture_clamping_element,model_sf_fixture_clamping_element,base.group_user,1,1,1,1
access_sf_clamping_element_type,sf_clamping_element_type,model_sf_clamping_element_type,base.group_user,1,1,1,1
access_sf_fixture_tool_setting,sf_fixture_tool_setting,model_sf_fixture_tool_setting,base.group_user,1,1,1,1
access_sf_tool_setting_type,sf_tool_setting_type,model_sf_tool_setting_type,base.group_user,1,1,1,1
access_sf_fixture_locating_device,sf_fixture_locating_device,model_sf_fixture_locating_device,base.group_user,1,1,1,1
access_sf_locating_device_type,sf_locating_device_type,model_sf_locating_device_type,base.group_user,1,1,1,1
access_sf_locating_device_locate_mode,sf_locating_device_locate_mode,model_sf_locating_device_locate_mode,base.group_user,1,1,1,1
access_sf_fixture_guide_element,sf_fixture_guide_element,model_sf_fixture_guide_element,base.group_user,1,1,1,1
access_sf_guide_element_type,sf_guide_element_type,model_sf_guide_element_type,base.group_user,1,1,1,1
access_sf_guide_element_guide_mode,sf_guide_element_guide_mode,model_sf_guide_element_guide_mode,base.group_user,1,1,1,1
access_sf_guide_element_way_to_install,sf_guide_element_way_to_install,model_sf_guide_element_way_to_install,base.group_user,1,1,1,1
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_sf_machine_tool sf_machine_tool model_sf_machine_tool base.group_user 1 1 1 1
access_sf_cutting_tool_category sf_cutting_tool_category model_sf_cutting_tool_category base.group_user 1 1 1 1
3 access_sf_machine_tool_type sf_machine_tool_type model_sf_machine_tool_type base.group_user 1 1 1 1
access_sf_cutting_tool_type sf_cutting_tool_type model_sf_cutting_tool_type base.group_user 1 1 1 1
4 access_sf_machine_brand sf_machine_brand model_sf_machine_brand base.group_user 1 1 1 1
5 access_sf_machine_brand_tags sf_machine_brand_tags model_sf_machine_brand_tags base.group_user 1 1 1 1
6 access_sf_machine_control_system sf_machine_control_system model_sf_machine_control_system base.group_user 1 1 1 1
29 access_sf_chuck sf.chuck model_sf_chuck base.group_user 1 1 1 1
30 access_sf_chuck_model sf.chuck.model model_sf_chuck_model base.group_user 1 1 1 1
31 access_sf_cutting_tool_material sf.cutting.tool.material model_sf_cutting_tool_material base.group_user 1 1 1 1
32 access_sf_fixture_setting_element sf_fixture_setting_element model_sf_fixture_setting_element base.group_user 1 1 1 1
33 access_sf_setting_element_type sf_setting_element_type model_sf_setting_element_type base.group_user 1 1 1 1
34 access_sf_fixture_clamping_element sf_fixture_clamping_element model_sf_fixture_clamping_element base.group_user 1 1 1 1
35 access_sf_clamping_element_type sf_clamping_element_type model_sf_clamping_element_type base.group_user 1 1 1 1
36 access_sf_fixture_tool_setting sf_fixture_tool_setting model_sf_fixture_tool_setting base.group_user 1 1 1 1
37 access_sf_tool_setting_type sf_tool_setting_type model_sf_tool_setting_type base.group_user 1 1 1 1
38 access_sf_fixture_locating_device sf_fixture_locating_device model_sf_fixture_locating_device base.group_user 1 1 1 1
39 access_sf_locating_device_type sf_locating_device_type model_sf_locating_device_type base.group_user 1 1 1 1
40 access_sf_locating_device_locate_mode sf_locating_device_locate_mode model_sf_locating_device_locate_mode base.group_user 1 1 1 1
41 access_sf_fixture_guide_element sf_fixture_guide_element model_sf_fixture_guide_element base.group_user 1 1 1 1
42 access_sf_guide_element_type sf_guide_element_type model_sf_guide_element_type base.group_user 1 1 1 1
43 access_sf_guide_element_guide_mode sf_guide_element_guide_mode model_sf_guide_element_guide_mode base.group_user 1 1 1 1
44 access_sf_guide_element_way_to_install sf_guide_element_way_to_install model_sf_guide_element_way_to_install base.group_user 1 1 1 1
45
46
47
48