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

1.产品模板优化：增加产品类别的搜索面板

Browse Source 
2.夹具型号注册到cloud：夹具型号的Tree和form视图去掉不可增删改操作，页面新增时编码根据夹具物料回显不同的编码；新增注册按钮及对应的注册接口
3.功能夹具注册到cloud：.功能夹具的Tree和form视图去掉不可增删改操作，页面新增时编码和名称根据功能夹具类型和对应的托盘型号所进行回显
This commit is contained in:
jinling.yang
2023-08-01 17:39:40 +08:00
parent f6e50161c6
commit 5c2e7c80da
7 changed files with 336 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sf_base/views/base_view.xml
View File

@@ -21,7 +21,7 @@
<field name="name">tree.sf.machine.brand</field>
<field name="model">sf.machine.brand</field>
<field name="arch" type="xml">
<tree string="品牌" create="0" edit="0" delete="0">
<tree string="品牌">
<field name="code"/>
<field name="name"/>
<field name="manufacturer_model_number"/>
@@ -61,7 +61,7 @@
<field name="name">品牌</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sf.machine.brand</field>
<field name="view_mode">tree</field>
<field name="view_mode">tree,form</field>
</record>
#------------------机床型号------------------
@@ -81,7 +81,7 @@
<field name="name">tree.sf.machine_tool.type</field>
<field name="model">sf.machine_tool.type</field>
<field name="arch" type="xml">
<tree string="机床型号" create="0" edit="0" delete="0">
<tree string="机床型号" >
<field name="code"/>
<field name="name"/>
<field name="brand_id"/>

18
sf_base/views/fixture_view.xml
View File

@@ -161,7 +161,7 @@
<field name="name">夹具型号</field>
<field name="model">sf.fixture.model</field>
<field name="arch" type="xml">
<tree string="夹具型号" create="0" edit="0" delete="0">
<tree string="夹具型号">
<field name="code"/>
<field name="name"/>
<field name="brand_id"/>
@@ -175,17 +175,21 @@
<field name="name">夹具型号</field>
<field name="model">sf.fixture.model</field>
<field name="arch" type="xml">
<form string="夹具型号" create="0" edit="0" delete="0">
<form string="夹具型号">
<header>
<button type="object" class="oe_highlight" name='register_fixture_model' string="机床注册"
attrs="{'invisible': [('code','!=',False)]}"/>
</header>
<sheet>
<group string="基本信息">
<group>
<field name="code" force_save="1"/>
<field name="name"/>
<field name="brand_id"/>
<field name="brand_id" options="{'no_create': True}"/>
<field name="manufacturer_model_number"/>
<field name="fixture_material_id"/>
<field name="fixture_material_id" options="{'no_create': True}"/>
<field name="fixture_material_type" invisible="1"/>
<field name="multi_mounting_type_id"/>
<field name="multi_mounting_type_id" options="{'no_create': True}"/>
</group>
<group>
<!-- <field name="upload_model_file" widget="many2many_binary"/>-->
@@ -232,7 +236,7 @@
<field name="maximum_clamping_force"></field>
</group>
<group>
<field name="materials_model_id"/>
<field name="materials_model_id" options="{'no_create': True}"/>
<field name="clamping_way"
attrs='{"invisible": [("fixture_material_type","not in",("气动托盘","磁吸托盘","虎钳托盘"))]}'/>
<field name="port_type"
@@ -243,7 +247,7 @@
attrs='{"invisible": [("fixture_material_type","!=",("转接板(锁板)托盘"))]}'/>
<field name="driving_way"
attrs='{"invisible": [("fixture_material_type","not in",("虎钳托盘","零点卡盘"))]}'/>
<field name="apply_machine_tool_type_id"
<field name="apply_machine_tool_type_ids" widget="many2many_tags" options="{'no_create': True}"
attrs='{"invisible": [("fixture_material_type","!=",("零点卡盘"))]}'/>
</group>
</group>

18
sf_base/views/functional_fixture_view.xml
View File

@@ -81,7 +81,7 @@
<field name="name">功能夹具</field>
<field name="model">sf.functional.fixture</field>
<field name="arch" type="xml">
<tree string="功能夹具" create="0" edit="0" delete="0">
<tree string="功能夹具">
<field name="code"/>
<field name="name"/>
<field name="type_id"/>
@@ -93,7 +93,7 @@
<field name="name">功能夹具</field>
<field name="model">sf.functional.fixture</field>
<field name="arch" type="xml">
<form string="功能夹具" create="0" edit="0" delete="0">
<form string="功能夹具">
<sheet>
<group string="基本信息">
<group>
@@ -101,15 +101,19 @@
<field name="name"/>
<field name="type_id"/>
<field name="type" invisible="1"/>
<field name="zero_chuck_model_ids" widget="many2many_tags"/>
<field name="zero_chuck_model_ids" widget="many2many_tags" options="{'no_create': True}"/>
<field name="transfer_tray_model_ids" widget="many2many_tags"
attrs="{'invisible': [('type', '!=', '转接板(锁板)式')]}"/>
options="{'no_create': True}"
attrs='{"invisible": [("type","!=","转接板(锁板)式")],"required": [("type", "=", "转接板(锁板)式")]}'/>
<field name="pneumatic_tray_model_ids" widget="many2many_tags"
attrs="{'invisible': [('type', '!=', '气动式')]}"/>
options="{'no_create': True}"
attrs='{"invisible": [("type","!=","气动式")],"required": [("type", "=", "气动式")]}'/>
<field name="magnetic_tray_model_ids" widget="many2many_tags"
attrs="{'invisible': [('type', '!=', '磁吸式')]}"/>
options="{'no_create': True}"
attrs='{"invisible": [("type","!=","磁吸式")],"required": [("type", "=", "磁吸式")]}'/>
<field name="vice_tray_model_ids" widget="many2many_tags"
attrs="{'invisible': [('type', '!=', '虎钳式')]}"/>
options="{'no_create': True}"
attrs='{"invisible": [("type","!=","虎钳式")],"required": [("type", "=", "虎钳式")]}'/>
</group>
</group>
</sheet>