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

166
sf_base/views/tool_base_views.xml
View File

@@ -1,6 +1,52 @@
<?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>
<!-- 刀具物料search view -->
<record model="ir.ui.view" id="view_cutting_tool_material_search">
<field name="name">sf.cutting.tool.material.search</field>
<field name="model">sf.cutting.tool.material</field>
<field name="arch" type="xml">
<search string="刀具物料">
<field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
<field name="code" string="编码搜索" filter_domain="[('code','ilike',self)]"/>
</search>
</field>
</record>
<!-- 功能刀具tree view -->
<record id="view_functional_cutting_tool_tree" model="ir.ui.view">
<field name="name">sf.functional.cutting.tool.tree</field>
@@ -82,6 +128,17 @@
</form>
</field>
</record>
<!-- 功能刀具search view -->
<record model="ir.ui.view" id="view_sf_functional_cutting_tool_search">
<field name="name">sf.functional.cutting.tool.search</field>
<field name="model">sf.functional.cutting.tool</field>
<field name="arch" type="xml">
<search string="功能刀具">
<field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
<field name="code" string="编码搜索" filter_domain="[('code','ilike',self)]"/>
</search>
</field>
</record>
<!-- 整体式刀具tree view -->
<record id="view_integral_cutting_tool_tree" model="ir.ui.view">
@@ -113,6 +170,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"/>
@@ -126,6 +184,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"/>
@@ -137,17 +197,28 @@
<group string='其他信息'>
<group>
<field name="nut"/>
<field name="chuck_model"/>
</group>
<group>
<field name="scope"/>
</group>
</group>
</group>
</sheet>
</form>
</field>
</record>
<!-- 整体式刀具search view -->
<record model="ir.ui.view" id="view_integral_cutting_tool_search">
<field name="name">sf.integral.cutting.tool.search</field>
<field name="model">sf.integral.cutting.tool</field>
<field name="arch" type="xml">
<search string="整体式刀具">
<field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
<field name="code" string="编码搜索" filter_domain="[('code','ilike',self)]"/>
</search>
</field>
</record>
<!-- 刀片tree -->
<record id="view_blade_tree" model="ir.ui.view">
<field name="name">sf.blade.tree</field>
@@ -176,6 +247,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"/>
@@ -189,7 +261,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"/>
@@ -197,15 +270,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>
@@ -213,6 +283,17 @@
</form>
</field>
</record>
<!-- 刀片search view -->
<record model="ir.ui.view" id="view_blade_search">
<field name="name">sf.blade.search</field>
<field name="model">sf.blade</field>
<field name="arch" type="xml">
<search string="刀片">
<field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
<field name="code" string="编码搜索" filter_domain="[('code','ilike',self)]"/>
</search>
</field>
</record>
<!-- 刀杆tree -->
<record id="view_cutter_bar_tree" model="ir.ui.view">
<field name="name">sf.cutter.bar.tree</field>
@@ -241,6 +322,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"/>
@@ -269,7 +353,6 @@
</group>
<group>
<field name="scope"/>
<field name="blade"/>
</group>
</group>
@@ -278,6 +361,17 @@
</form>
</field>
</record>
<!-- 刀杆search view -->
<record model="ir.ui.view" id="view_cutter_bar_search">
<field name="name">sf.cutter.bar.search</field>
<field name="model">sf.cutter.bar</field>
<field name="arch" type="xml">
<search string="刀杆">
<field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
<field name="code" string="编码搜索" filter_domain="[('code','ilike',self)]"/>
</search>
</field>
</record>
<!-- 刀盘tree -->
<record id="view_cutter_pad_tree" model="ir.ui.view">
@@ -307,6 +401,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"/>
@@ -334,7 +431,6 @@
</group>
<group>
<field name="scope"/>
<field name="blade"/>
</group>
</group>
</group>
@@ -342,6 +438,17 @@
</form>
</field>
</record>
<!-- 刀盘search view -->
<record model="ir.ui.view" id="view_cutter_pad_search">
<field name="name">sf.cutter.pad.search</field>
<field name="model">sf.cutter.pad</field>
<field name="arch" type="xml">
<search string="刀盘">
<field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
<field name="code" string="编码搜索" filter_domain="[('code','ilike',self)]"/>
</search>
</field>
</record>
<!-- 刀柄tree -->
<record id="view_cutter_handle_tree" model="ir.ui.view">
@@ -371,6 +478,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"/>
@@ -396,7 +506,6 @@
<group string='其他信息'>
<group>
<field name="nut"/>
<field name="chuck_model"/>
</group>
<!-- <group> -->
<!-- <field name="scope"/> -->
@@ -408,6 +517,17 @@
</form>
</field>
</record>
<!-- 刀柄search view -->
<record model="ir.ui.view" id="view_handle_search">
<field name="name">sf.handle.search</field>
<field name="model">sf.handle</field>
<field name="arch" type="xml">
<search string="刀柄">
<field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
<field name="code" string="编码搜索" filter_domain="[('code','ilike',self)]"/>
</search>
</field>
</record>
<!-- 夹头tree -->
<record id="view_cutter_chuck_tree" model="ir.ui.view">
@@ -437,6 +557,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"/>
@@ -459,7 +582,6 @@
<group string='其他信息'>
<group>
<field name="nut"/>
<field name="handle_model"/>
</group>
<!-- <group> -->
<!-- <field name="scope"/> -->
@@ -471,6 +593,17 @@
</form>
</field>
</record>
<!-- 夹头search view -->
<record model="ir.ui.view" id="view_chuck_search">
<field name="name">sf.chuck.search</field>
<field name="model">sf.chuck</field>
<field name="arch" type="xml">
<search string="夹头">
<field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
<field name="code" string="编码搜索" filter_domain="[('code','ilike',self)]"/>
</search>
</field>
</record>
<!-- 功能刀具类型tree -->
<record id="view_cutter_function_tree" model="ir.ui.view">
@@ -529,6 +662,7 @@
<group>
<field name="code"/>
<field name="name"/>
<field name="cutting_tool_material"/>
</group>
<group>
<field name="remark"/>
@@ -562,7 +696,7 @@
<group>
<field name="code"/>
<field name="name"/>
<field name="blade_ids"/>
<field name="cutting_tool_material"/>
</group>
<group>
<field name="remark"/>
@@ -596,6 +730,7 @@
<group>
<field name="code"/>
<field name="name"/>
<field name="cutting_tool_material"/>
</group>
<group>
<field name="remark"/>
@@ -629,6 +764,7 @@
<group>
<field name="code"/>
<field name="name"/>
<field name="cutting_tool_material"/>
</group>
<group>
<field name="remark"/>
@@ -663,6 +799,7 @@
<group>
<field name="code"/>
<field name="name"/>
<field name="cutting_tool_material"/>
</group>
<group>
<field name="remark"/>
@@ -696,6 +833,7 @@
<group>
<field name="code"/>
<field name="name"/>
<field name="cutting_tool_material"/>
</group>
<group>
<field name="remark"/>
@@ -705,7 +843,5 @@
</form>
</field>
</record>
</data>
</odoo>