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

This commit is contained in:
jinling.yang
2023-06-29 17:14:48 +08:00
141 changed files with 20125 additions and 4856 deletions

View File

@@ -41,48 +41,48 @@
<!-- 刀具 -->
<menuitem
id="menu_sf_cutting_tool"
parent="menu_sf_base"
parent="mrp.menu_mrp_configuration"
name="刀具"
sequence="3"
sequence="4"
/>
<!-- 刀具物料 -->
<menuitem
id="menu_sf_cutting_tool_material"
parent="menu_sf_base"
parent="menu_sf_cutting_tool"
name="刀具物料"
sequence="6"
sequence="1"
action="action_sf_cutting_tool_material"
/>
<!-- 刀具类型 -->
<menuitem
id="menu_sf_cutting_tool_type"
parent="menu_sf_base"
parent="menu_sf_cutting_tool"
name="刀具类型"
sequence="10"
sequence="2"
action="action_sf_cutting_tool_type"
/>
<!-- 刀具型号 -->
<menuitem
id="menu_sf_integral_cutting_tool"
parent="menu_sf_base"
parent="menu_sf_cutting_tool"
name="刀具型号"
sequence="15"
sequence="3"
action="action_sf_cutting_tool"
/>
<!-- 功能刀具 -->
<menuitem
id="menu_sf_functional_cutting_tool"
parent="menu_sf_base"
parent="menu_sf_cutting_tool"
name="功能刀具"
sequence="21"
sequence="4"
action="action_sf_functional_cutting_tool"
/>
<!-- 功能刀具类型 -->
<menuitem
id="menu_sf_functional_cutting_tool_model_type"
parent="menu_sf_base"
parent="menu_sf_cutting_tool"
name="功能刀具类型"
sequence="26"
sequence="5"
action="action_sf_functional_cutting_tool_model_type"
/>
</data>