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-15 16:14:50 +08:00
parent 34cc5bf125 a205220acd
commit c7ec8be141
9 changed files with 678 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_base/views/menu_fixture_view.xml
View File

@@ -8,7 +8,7 @@
<menuitem id="menu_sf_functional_fixture_list_2"
name="夹具"
parent="menu_sf_base"
sequence="6"
sequence="70"
/>
<!-- <menuitem id="menu_sf_functional_fixture_list_3"-->

42
sf_base/views/tool_base_menu.xml
View File

@@ -100,17 +100,15 @@
<field name="res_model">sf.chuck.model</field>
<field name="view_mode">tree,form</field>
</record>
<!-- 刀具物料action -->
<record id="action_sf_cutting_tool_material" model="ir.actions.act_window">
<field name="name">刀具物料</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sf.cutting.tool.material</field>
<field name="view_mode">tree,form</field>
</record>
<!-- 刀具 -->
<!-- <menuitem -->
<!-- id="menu_sf_cutting_tool" -->
<!-- parent="mrp.menu_mrp_configuration" -->
<!-- name="刀具" -->
<!-- sequence="3" -->
<!-- /> -->
<!-- 功能刀具 -->
<!-- parent="menu_sf_cutting_tool" -->
<!-- 功能刀具 -->
<menuitem
id="menu_sf_functional_cutting_tool"
parent="menu_sf_base"
@@ -118,21 +116,15 @@
sequence="3"
action="action_sf_functional_cutting_tool"
/>
<!-- --><!-- 刀具物料 -->
<!-- <menuitem -->
<!-- id="menu_sf_cutting_tool_material" -->
<!-- parent="menu_sf_cutting_tool" -->
<!-- name="刀具物料" -->
<!-- sequence="1" -->
<!-- /> -->
<!-- 刀具物料 -->
<menuitem
id="menu_sf_cutting_tool_material"
parent="menu_sf_base"
name="刀具物料"
sequence="1"
action="action_sf_cutting_tool_material"
/>
<!-- --><!-- 刀头 -->
<!-- <menuitem -->
<!-- id="menu_sf_cutting_tool_head" -->
<!-- parent="menu_sf_cutting_tool" -->
<!-- name="刀头" -->
<!-- sequence="2" -->
<!-- /> -->
<!-- 整体式刀具 -->
<menuitem
@@ -238,7 +230,5 @@
sequence="64"
action="action_sf_cutting_tool_clamp_head_type"
/>
</data>
</odoo>

77
sf_base/views/tool_base_views.xml
View File

@@ -1,6 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<odoo>
<data>
<!-- 刀具物料tree view -->
<record id="view_cutting_tool_material_tree" model="ir.ui.view">
<field name="name">sf.cutting.tool.material.tree</field>
<field name="model">sf.cutting.tool.material</field>
<field name="arch" type="xml">
<tree string="刀具物料">
<field name="code"/>
<field name="name"/>
<field name="remark"/>
</tree>
</field>
</record>
<!-- 刀具物料form view -->
<record id="view_cutting_tool_material_form" model="ir.ui.view">
<field name="name">sf.cutting.tool.material.form</field>
<field name="model">sf.cutting.tool.material</field>
<field name="arch" type="xml">
<form string="刀具物料">
<sheet>
<group col='1'>
<group string='基本信息'>
<group>
<field name="code"/>
<field name="name"/>
</group>
<group>
<field name="remark"/>
</group>
</group>
</group>
</sheet>
</form>
</field>
</record>
<!-- 功能刀具tree view -->
<record id="view_functional_cutting_tool_tree" model="ir.ui.view">
<field name="name">sf.functional.cutting.tool.tree</field>
@@ -97,6 +131,7 @@
<field name="name"/>
<field name="integral_model_number"/>
<field name="brand"/>
<field name="cutting_tool_material"/>
</group>
<group>
<field name="image" nolabel="1" widget="image"/>
@@ -110,6 +145,8 @@
<field name="blade_length"/>
<field name="diameter"/>
<field name="blade_number"/>
<field name="chuck_model" widget="many2many_tags" options="{'no_create': True, 'no_quick_create': True}"/>
</group>
<group>
<field name="front_angle"/>
@@ -121,12 +158,12 @@
<group string='其他信息'>
<group>
<field name="nut"/>
<field name="chuck_model"/>
</group>
<group>
<field name="scope"/>
</group>
</group>
</group>
</sheet>
</form>
@@ -160,6 +197,7 @@
<field name="name"/>
<field name="blade_model_number"/>
<field name="brand" options="{'no_create': True, 'no_quick_create': True}"/>
<field name="cutting_tool_material"/>
</group>
<group>
<field name="image" nolabel="1" widget="image"/>
@@ -173,7 +211,8 @@
<field name="height"/>
<field name="top_angle"/>
<field name="front_angle"/>
<field name="rear_angle"/>
<field name="cutter_bar" widget="many2many_tags" options="{'no_create': True, 'no_quick_create': True}"/>
<field name="cutter_pad" widget="many2many_tags" options="{'no_create': True, 'no_quick_create': True}"/>
</group>
<group>
<field name="main_included_angle"/>
@@ -181,15 +220,12 @@
<field name="material_model"/>
<field name="hardness"/>
<field name="radius"/>
<field name="rear_angle"/>
</group>
</group>
<group string='其他信息'>
<group>
<field name="nut"/>
<field name="cutter_bar" widget="many2many_tags" options="{'no_create': True, 'no_quick_create': True}"/>
</group>
<group>
<field name="cutter_pad" widget="many2many_tags" options="{'no_create': True, 'no_quick_create': True}"/>
</group>
</group>
</group>
@@ -225,6 +261,9 @@
<field name="name"/>
<field name="cutter_bar_model_number"/>
<field name="brand"/>
<field name="cutting_tool_material"/>
<field name="blade" widget="many2many_tags" options="{'no_create': True, 'no_quick_create': True}"/>
</group>
<group>
<field name="image" nolabel="1" widget="image"/>
@@ -253,7 +292,6 @@
</group>
<group>
<field name="scope"/>
<field name="blade"/>
</group>
</group>
@@ -291,6 +329,9 @@
<field name="name"/>
<field name="cutter_pad_model_number"/>
<field name="brand"/>
<field name="cutting_tool_material"/>
<field name="blade" widget="many2many_tags" options="{'no_create': True, 'no_quick_create': True}"/>
</group>
<group>
<field name="image" nolabel="1" widget="image"/>
@@ -318,7 +359,6 @@
</group>
<group>
<field name="scope"/>
<field name="blade"/>
</group>
</group>
</group>
@@ -355,6 +395,9 @@
<field name="name"/>
<field name="handle_model_number"/>
<field name="brand"/>
<field name="cutting_tool_material"/>
<field name="chuck_model" widget="many2many_tags" options="{'no_create': True, 'no_quick_create': True}"/>
</group>
<group>
<field name="image" nolabel="1" widget="image"/>
@@ -380,7 +423,6 @@
<group string='其他信息'>
<group>
<field name="nut"/>
<field name="chuck_model"/>
</group>
<!-- <group> -->
<!-- <field name="scope"/> -->
@@ -421,6 +463,9 @@
<field name="name"/>
<field name="chuck_model_number"/>
<field name="brand"/>
<field name="cutting_tool_material"/>
<field name="handle_model" widget="many2many_tags" options="{'no_create': True, 'no_quick_create': True}"/>
</group>
<group>
<field name="image" nolabel="1" widget="image"/>
@@ -443,7 +488,6 @@
<group string='其他信息'>
<group>
<field name="nut"/>
<field name="handle_model"/>
</group>
<!-- <group> -->
<!-- <field name="scope"/> -->
@@ -513,6 +557,7 @@
<group>
<field name="code"/>
<field name="name"/>
<field name="cutting_tool_material"/>
</group>
<group>
<field name="remark"/>
@@ -546,7 +591,7 @@
<group>
<field name="code"/>
<field name="name"/>
<field name="blade_ids"/>
<field name="cutting_tool_material"/>
</group>
<group>
<field name="remark"/>
@@ -580,6 +625,7 @@
<group>
<field name="code"/>
<field name="name"/>
<field name="cutting_tool_material"/>
</group>
<group>
<field name="remark"/>
@@ -613,6 +659,7 @@
<group>
<field name="code"/>
<field name="name"/>
<field name="cutting_tool_material"/>
</group>
<group>
<field name="remark"/>
@@ -647,6 +694,7 @@
<group>
<field name="code"/>
<field name="name"/>
<field name="cutting_tool_material"/>
</group>
<group>
<field name="remark"/>
@@ -680,6 +728,7 @@
<group>
<field name="code"/>
<field name="name"/>
<field name="cutting_tool_material"/>
</group>
<group>
<field name="remark"/>
@@ -689,7 +738,5 @@
</form>
</field>
</record>
</data>
</odoo>