Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改刀具标准库部分字段类型
This commit is contained in:
jinling.yang
@@ -61,6 +61,16 @@
|
||||
</span>
|
||||
</div>
|
||||
</button>
|
||||
<button class="oe_stat_button"
|
||||
name="open_safety_stock"
|
||||
icon="fa-list-ul"
|
||||
type="object">
|
||||
<div class="o_field_widget o_stat_info">
|
||||
<span>
|
||||
安全库存
|
||||
</span>
|
||||
</div>
|
||||
</button>
|
||||
</div>
|
||||
<div class="oe_title">
|
||||
<h1>
|
||||
@@ -264,126 +274,96 @@
|
||||
</record>
|
||||
|
||||
|
||||
<!-- =====================================功能刀具实时分布============================================================= -->
|
||||
<!-- =====================================功能刀具安全库存=================================================== -->
|
||||
<record id="sf_real_time_distribution_of_functional_tools_view_tree" model="ir.ui.view">
|
||||
<field name="name">功能刀具实时分布</field>
|
||||
<field name="name">功能刀具安全库存</field>
|
||||
<field name="model">sf.real.time.distribution.of.functional.tools</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree create="0" edit="0" delete="0">
|
||||
<field name="barcode_id"/>
|
||||
<field name="functional_tool_name_id"/>
|
||||
<field name="mrs_cutting_tool_type_id"/>
|
||||
<field name="cutting_tool_integral_model_id" optional="hide"/>
|
||||
<field name="cutting_tool_blade_model_id" optional="hide"/>
|
||||
<field name="cutting_tool_cutterbar_model_id" optional="hide"/>
|
||||
<field name="cutting_tool_cutterpad_model_id" optional="hide"/>
|
||||
<field name="cutting_tool_cutterhandle_model_id" optional="hide"/>
|
||||
<field name="cutting_tool_cutterhead_model_id" optional="hide"/>
|
||||
|
||||
<field name="name"/>
|
||||
<field name="sf_cutting_tool_type_id" invisible="True"/>
|
||||
<field name="diameter"/>
|
||||
<field name="knife_tip_r_angle"/>
|
||||
<field name="coarse_middle_thin"/>
|
||||
<field name="tool_stock_num"/>
|
||||
<field name="side_shelf_num"/>
|
||||
<field name="on_tool_stock_num"/>
|
||||
<field name="tool_stock_total"/>
|
||||
<field name="return_reuse_num_re" optional="hide"/>
|
||||
<field name="return_reuse_num_co" optional="hide"/>
|
||||
<field name="return_processing_num" optional="hide"/>
|
||||
<field name="return_total" optional="hide"/>
|
||||
<field name="total" optional="hide"/>
|
||||
<field name="remark"/>
|
||||
<field name="min_stock_num"/>
|
||||
<field name="max_stock_num"/>
|
||||
<field name="batch_replenishment_num"/>
|
||||
<field name="unit"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="sf_real_time_distribution_of_functional_tools_view_form" model="ir.ui.view">
|
||||
<field name="name">功能刀具实时分布</field>
|
||||
<field name="name">功能刀具安全库存</field>
|
||||
<field name="model">sf.real.time.distribution.of.functional.tools</field>
|
||||
<field name="arch" type="xml">
|
||||
<form create="0" edit="0" delete="0">
|
||||
<sheet>
|
||||
<div class="oe_title">
|
||||
<h1>
|
||||
<field name="barcode_id" readonly="1"/>
|
||||
<field name="name"/>
|
||||
</h1>
|
||||
</div>
|
||||
<group>
|
||||
<group>
|
||||
<field name="functional_tool_name_id" invisible="False"/>
|
||||
<field name="mrs_cutting_tool_type_id"/>
|
||||
|
||||
<field name="cutting_tool_integral_model_id"
|
||||
options="{'no_create': True, 'no_quick_create': True}"
|
||||
attrs="{'invisible': [('cutting_tool_blade_model_id', '!=', False)]}"
|
||||
/>
|
||||
<field name="cutting_tool_blade_model_id"
|
||||
options="{'no_create': True, 'no_quick_create': True}"
|
||||
attrs="{'invisible': [('cutting_tool_integral_model_id', '!=', False)]}"
|
||||
/>
|
||||
<field name="cutting_tool_cutterbar_model_id"
|
||||
options="{'no_create': True, 'no_quick_create': True}"
|
||||
attrs="{'invisible': ['|',('cutting_tool_cutterpad_model_id','!=',False),('cutting_tool_blade_model_id', '=', False)]}"
|
||||
/>
|
||||
<field name="cutting_tool_cutterpad_model_id"
|
||||
options="{'no_create': True, 'no_quick_create': True}"
|
||||
attrs="{'invisible': ['|',('cutting_tool_cutterbar_model_id','!=',False),('cutting_tool_blade_model_id', '=', False)]}"
|
||||
/>
|
||||
<field name="cutting_tool_cutterhandle_model_id"
|
||||
options="{'no_create': True, 'no_quick_create': True}"/>
|
||||
<field name="cutting_tool_cutterhead_model_id"
|
||||
options="{'no_create': True, 'no_quick_create': True}"/>
|
||||
|
||||
<field name="sf_cutting_tool_type_id"/>
|
||||
<field name="diameter"/>
|
||||
<field name="knife_tip_r_angle"/>
|
||||
<field name="coarse_middle_thin"/>
|
||||
<field name="whether_standard_knife"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="image" nolabel="1" widget="image"/>
|
||||
<field name="image" widget='image'/>
|
||||
</group>
|
||||
</group>
|
||||
<group col="1">
|
||||
<group string="适合加工方式">
|
||||
<field name="suitable_machining_method_ids" string=""
|
||||
widget="custom_many2many_checkboxes"
|
||||
domain="[('id','in',suitable_machining_method_ids)]"/>
|
||||
</group>
|
||||
<group>
|
||||
<group string="刀尖特征">
|
||||
<field name="blade_tip_characteristics_id" string=""
|
||||
widget="custom_many2many_checkboxes"
|
||||
domain="[('id','in',blade_tip_characteristics_id)]"/>
|
||||
</group>
|
||||
<group string="柄部类型">
|
||||
<field name="handle_type_ids" string="" widget="custom_many2many_checkboxes"
|
||||
domain="[('id','in',handle_type_ids)]"/>
|
||||
</group>
|
||||
</group>
|
||||
<group>
|
||||
<group string="走刀方向">
|
||||
<field name="cutting_direction_ids" string="" widget="custom_many2many_checkboxes"
|
||||
domain="[('id','in',cutting_direction_ids)]"/>
|
||||
</group>
|
||||
<group string="适合冷却液">
|
||||
<field name="suitable_coolant_ids" string="" widget="custom_many2many_checkboxes"
|
||||
domain="[('id','in',suitable_coolant_ids)]"/>
|
||||
</group>
|
||||
</group>
|
||||
</group>
|
||||
<notebook>
|
||||
<page string="实时分布信息">
|
||||
<group>
|
||||
<group>
|
||||
<group>
|
||||
<field name="tool_stock_num"/>
|
||||
<field name="return_reuse_num_re"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="side_shelf_num"/>
|
||||
<field name="return_reuse_num_co"/>
|
||||
</group>
|
||||
</group>
|
||||
<group>
|
||||
<group>
|
||||
<field name="on_tool_stock_num"/>
|
||||
<field name="return_processing_num"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="tool_stock_total"/>
|
||||
<field name="return_total"/>
|
||||
<field name="total"/>
|
||||
</group>
|
||||
</group>
|
||||
</group>
|
||||
</page>
|
||||
<page string="参数信息">
|
||||
<group>
|
||||
<group>
|
||||
<field name="diameter"/>
|
||||
<field name="tool_grade"/>
|
||||
<field name="machining_accuracy"/>
|
||||
<field name="tool_length"/>
|
||||
<field name="blade_number"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="integral_blade_length"/>
|
||||
<field name="effective_blade_length"/>
|
||||
<field name="max_life"/>
|
||||
<field name="is_standard" default="false"/>
|
||||
<field name="applicable_range"/>
|
||||
</group>
|
||||
</group>
|
||||
</page>
|
||||
<page string="其他信息">
|
||||
<group>
|
||||
<field name="remark"/>
|
||||
</group>
|
||||
<page string="刀具信息">
|
||||
<field name="sf_functional_cutting_tool_entity_ids" widget="many2many">
|
||||
<tree>
|
||||
<field name="barcode_id"/>
|
||||
<field name="functional_tool_name_id"/>
|
||||
<field name="new_former"/>
|
||||
<field name="tool_loading_length"/>
|
||||
<field name="functional_tool_length"/>
|
||||
<field name="effective_length"/>
|
||||
<field name="max_lifetime_value"/>
|
||||
<field name="alarm_value"/>
|
||||
<field name="used_value"/>
|
||||
<field name="functional_tool_status"/>
|
||||
</tree>
|
||||
</field>
|
||||
</page>
|
||||
</notebook>
|
||||
</sheet>
|
||||
@@ -392,28 +372,31 @@
|
||||
</record>
|
||||
|
||||
<record id="sf_real_time_distribution_of_functional_tools_view_search" model="ir.ui.view">
|
||||
<field name="name">功能刀具实时分布</field>
|
||||
<field name="name">功能刀具安全库存</field>
|
||||
<field name="model">sf.real.time.distribution.of.functional.tools</field>
|
||||
<field name="arch" type="xml">
|
||||
<search>
|
||||
<field name="barcode_id"/>
|
||||
<field name="functional_tool_name_id"/>
|
||||
<field name="mrs_cutting_tool_type_id"/>
|
||||
<field name="cutting_tool_integral_model_id" optional="hide"/>
|
||||
<field name="cutting_tool_blade_model_id" optional="hide"/>
|
||||
<field name="cutting_tool_cutterbar_model_id" optional="hide"/>
|
||||
<field name="cutting_tool_cutterpad_model_id" optional="hide"/>
|
||||
<field name="cutting_tool_cutterhandle_model_id" optional="hide"/>
|
||||
<field name="cutting_tool_cutterhead_model_id" optional="hide"/>
|
||||
<field name="name"/>
|
||||
<field name="sf_cutting_tool_type_id" invisible="True"/>
|
||||
<field name="diameter"/>
|
||||
<field name="knife_tip_r_angle"/>
|
||||
<field name="tool_stock_num"/>
|
||||
<field name="side_shelf_num"/>
|
||||
<field name="on_tool_stock_num"/>
|
||||
<field name="tool_stock_total"/>
|
||||
<field name="min_stock_num"/>
|
||||
<field name="max_stock_num"/>
|
||||
<field name="batch_replenishment_num"/>
|
||||
<field name="unit"/>
|
||||
<searchpanel>
|
||||
<field name="mrs_cutting_tool_type_id" enable_counters="1" icon="fa-building"/>
|
||||
<field name="sf_cutting_tool_type_id" enable_counters="1" icon="fa-building"/>
|
||||
</searchpanel>
|
||||
</search>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="sf_real_time_distribution_of_functional_tools_view_act" model="ir.actions.act_window">
|
||||
<field name="name">功能刀具实时分布</field>
|
||||
<field name="name">功能刀具安全库存</field>
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">sf.real.time.distribution.of.functional.tools</field>
|
||||
<field name="view_mode">tree,form,search</field>
|
||||
|
||||
Reference in New Issue
Block a user