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

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增夹具功能

Browse Source
This commit is contained in:
jinling.yang
2023-06-29 17:14:48 +08:00
parent aea68f5239 3907901dc3
commit 0f7f67aade
141 changed files with 20125 additions and 4856 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
sf_base/views/menu_view.xml
View File

@@ -16,18 +16,39 @@
action="action_mrp_configuration"
groups="base.group_system"/>-->
<menuitem
id="menu_sf_machine_tool"
id="menu_sf_machine_tool_first"
parent="mrp.menu_mrp_configuration"
name="机床"
sequence="1"
sequence="3"
/>
<menuitem
id="menu_sf_machine_tool"
parent="menu_sf_machine_tool_first"
name="机床"
sequence="0"
action="action_sf_machine_tool"
/>
<menuitem
id="menu_sf_machine_tool_category"
parent="menu_sf_machine_tool_first"
name="机床类型"
sequence="1"
action="action_sf_machine_tool_category"/>
<menuitem
id="menu_sf_machine_tool_type"
parent="menu_sf_machine_tool_first"
name="机床型号"
sequence="2"
action="action_sf_machine_tool_type"/>
<menuitem
id="menu_sf_tray"
parent="mrp.menu_mrp_configuration"
name="托盘"
sequence="9"
sequence="8"
action="action_sf_tray"
/>
@@ -43,7 +64,7 @@
id="menu_sf_production_materials_1"
name="原材料"
parent="mrp.menu_mrp_configuration"
sequence="3"
sequence="6"
/>
@@ -51,7 +72,7 @@
id="menu_sf_production_process_1"
name="工艺"
parent="mrp.menu_mrp_configuration"
sequence="4"
sequence="7"
/>
@@ -98,13 +119,13 @@
sequence="3"
action="sf_processing_technology"/>
<!-- <menuitem-->
<!-- id="menu_sf_partner_views"-->
<!-- name="工厂token"-->
<!-- parent="menu_sf_base"-->
<!-- sequence="1"-->
<!-- action="token_factory_view"-->
<!-- />-->
<!-- <menuitem-->
<!-- id="menu_sf_partner_views"-->
<!-- name="工厂token"-->
<!-- parent="menu_sf_base"-->
<!-- sequence="1"-->
<!-- action="token_factory_view"-->
<!-- />-->
<menuitem
@@ -114,18 +135,6 @@
sequence="1"
action="action_sf_machine_brand"/>
<menuitem
id="menu_sf_machine_tool_type"
parent="menu_sf_base"
name="机床型号"
sequence="1"
action="action_sf_machine_tool_type"/>
<menuitem
id="menu_sf_machine_tool_category"
parent="menu_sf_base"
name="机床类型"
sequence="1"
action="action_sf_machine_tool_category"/>
<menuitem
id="menu_sf_machine_control_system"