Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工件装夹
This commit is contained in:
jinling.yang
@@ -10,8 +10,8 @@
|
||||
<search string="工件夹具">
|
||||
<field name="functional_fixture_code" string="编码"
|
||||
filter_domain="[('functional_fixture_code', 'ilike', self)]"/>
|
||||
<field name="functional_fixture_name" string="名称"
|
||||
filter_domain="[('functional_fixture_name', 'ilike', self)]"/>
|
||||
<field name="name" string="名称"
|
||||
filter_domain="[('name', 'ilike', self)]"/>
|
||||
<!-- <field name="material_id" string="材质"-->
|
||||
<!-- filter_domain="[('material_id.name', 'ilike', self)]"/>-->
|
||||
</search>
|
||||
@@ -24,8 +24,8 @@
|
||||
<field name="arch" type="xml">
|
||||
<tree string="工件夹具">
|
||||
<field name="functional_fixture_code"/>
|
||||
<field name="functional_fixture_name"/>
|
||||
<field name="functional_fixture_type"/>
|
||||
<field name="name"/>
|
||||
<field name="functional_fixture_type_id"/>
|
||||
<field name="chuck_type_id"/>
|
||||
<field name="chuck_name"/>
|
||||
<field name="chuck_brand_id"/>
|
||||
@@ -65,87 +65,57 @@
|
||||
<group string="基本信息">
|
||||
<group>
|
||||
<field name="functional_fixture_code"/>
|
||||
|
||||
</group>
|
||||
<group>
|
||||
<field name="functional_fixture_type"/>
|
||||
</group>
|
||||
</group>
|
||||
<!-- <group string="坯料（工件）申请信息">-->
|
||||
<!-- <group>-->
|
||||
<!-- <field name="functional_fixture_code"/>-->
|
||||
<!-- <field name="functional_fixture_type"/>-->
|
||||
<!--<!– <field name="surface_accuracy"/>–>-->
|
||||
<!-- </group>-->
|
||||
<!-- <group>-->
|
||||
<!-- <field name="functional_fixture_name"/>-->
|
||||
<!-- <label for="apply_length" string="尺寸[mm]"-->
|
||||
<!-- />-->
|
||||
<!-- <div class="o_address_format"-->
|
||||
<!-- >-->
|
||||
<!-- <label for="apply_length" string="长"/>-->
|
||||
<!-- <field name="apply_length" class="o_address_zip"-->
|
||||
<!-- options="{'format': false}"-->
|
||||
<!-- />-->
|
||||
<!-- <span>&nbsp;</span>-->
|
||||
<!-- <label for="apply_width" string="宽"/>-->
|
||||
<!-- <field name="apply_width" class="o_address_zip"-->
|
||||
<!-- options="{'format': false}"-->
|
||||
<!-- />-->
|
||||
<!-- <span>&nbsp;</span>-->
|
||||
<!-- <label for="apply_height" string="高"/>-->
|
||||
<!-- <field name="apply_height" class="o_address_zip"-->
|
||||
<!-- options="{'format': false}"-->
|
||||
<!-- />-->
|
||||
<!-- </div>-->
|
||||
<!-- <field name="apply_weight"/>-->
|
||||
<!-- <field name="apply_diameter"/>-->
|
||||
<!-- </group>-->
|
||||
<!-- </group>-->
|
||||
<group string="坯料（工件）装夹信息">
|
||||
<group string="卡盘">
|
||||
<field name="chuck_name"/>
|
||||
<field name="chuck_brand_id"/>
|
||||
<field name="chuck_type_id"/>
|
||||
<field name="chuck_model_id"/>
|
||||
</group>
|
||||
<group string="托盘">
|
||||
<field name="tray_name"/>
|
||||
<field name="tray_brand_id"/>
|
||||
<field name="tray_type_id"/>
|
||||
<field name="tray_model_id"/>
|
||||
</group>
|
||||
|
||||
<group>
|
||||
<field name="real_code"/>
|
||||
<field name="real_name"/>
|
||||
<!-- <label for="real_length" string="尺寸[mm]"-->
|
||||
<!-- />-->
|
||||
<!-- <div class="o_address_format"-->
|
||||
<!-- >-->
|
||||
<!-- <label for="real_length" string="长"/>-->
|
||||
<!-- <field name="real_length" class="o_address_zip"-->
|
||||
<!-- options="{'format': false}"-->
|
||||
<!-- />-->
|
||||
<!-- <span>&nbsp;</span>-->
|
||||
<!-- <label for="real_width" string="宽"/>-->
|
||||
<!-- <field name="real_width" class="o_address_zip"-->
|
||||
<!-- options="{'format': false}"-->
|
||||
<!-- />-->
|
||||
<!-- <span>&nbsp;</span>-->
|
||||
<!-- <label for="real_height" string="高"/>-->
|
||||
<!-- <field name="real_height" class="o_address_zip"-->
|
||||
<!-- options="{'format': false}"-->
|
||||
<!-- />-->
|
||||
<!-- </div>-->
|
||||
<!-- <field name="real_diameter"/>-->
|
||||
</group>
|
||||
</group>
|
||||
<group string="其他">
|
||||
<group>
|
||||
<field name="functional_fixture_type_id"/>
|
||||
<field name="remark"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="name"/>
|
||||
</group>
|
||||
</group>
|
||||
<notebook>
|
||||
<page string="装夹" name="clamping" attrs="{'invisible': [('chuck_type_id', '=', False)]}">
|
||||
<group>
|
||||
<group string="卡盘">
|
||||
<field name="chuck_type_id"></field>
|
||||
<field name="chuck_name"></field>
|
||||
<field name="chuck_brand_id"></field>
|
||||
<field name="chuck_model_id"></field>
|
||||
</group>
|
||||
<group string="托盘">
|
||||
<field name="tray_type_id"></field>
|
||||
<field name="tray_name"></field>
|
||||
<field name="tray_brand_id"></field>
|
||||
<field name="tray_model_id"></field>
|
||||
</group>
|
||||
<group string="坯料">
|
||||
<field name="real_code" string="坯料编码"></field>
|
||||
<field name="real_name" string="坯料名称"></field>
|
||||
<label for="real_length" string="尺寸[mm]"/>
|
||||
<div class="o_address_format">
|
||||
<label for="real_length" string="长"/>
|
||||
<field name="real_length" class="o_address_zip"
|
||||
options="{'format': false}"/>
|
||||
<span>&nbsp;</span>
|
||||
<label for="real_width" string="宽"/>
|
||||
<field name="real_width" class="o_address_zip"
|
||||
options="{'format': false}"/>
|
||||
<span>&nbsp;</span>
|
||||
<label for="real_height" string="高"/>
|
||||
<field name="real_height" class="o_address_zip"
|
||||
options="{'format': false}"/>
|
||||
</div>
|
||||
<field name="real_diameter" string="直径[mm]"></field>
|
||||
</group>
|
||||
</group>
|
||||
</page>
|
||||
<page string="出库" name="stock_removal"
|
||||
attrs="{'invisible': [('production_line', '=', False)]}">
|
||||
<group>
|
||||
<field name="production_line"></field>
|
||||
<field name="machine_tool" string="机台"></field>
|
||||
</group>
|
||||
</page>
|
||||
</notebook>
|
||||
</sheet>
|
||||
</form>
|
||||
</field>
|
||||
|
||||
Reference in New Issue
Block a user