1、功能刀具组装单添加物料校验标签字段、新增扫描校验功能、优化相关计算方法；2、添加新旧、粗中精字段值根据所选物料自动计算方法，伸出长自动计算方法；3、去除部分字段的校验方法；4、组装单form、tree视图布局调整，tree视图状态字段添加背景颜色，变更筛选条件；
This commit is contained in:
yuxianghui
@@ -448,7 +448,11 @@
|
||||
<field name="machine_tool_name_id" optional="hide"/>
|
||||
<field name="applicant" optional="hide"/>
|
||||
<field name="apply_time"/>
|
||||
<field name="assemble_status"/>
|
||||
<field name="assemble_status" widget='badge'
|
||||
decoration-info="assemble_status == '0'"
|
||||
decoration-warning="assemble_status == '01'"
|
||||
decoration-success="assemble_status == '1'"
|
||||
/>
|
||||
|
||||
<!-- <field name="name" invisible="True"/>-->
|
||||
<!-- <field name="machine_tool_code" invisible="True"/>-->
|
||||
@@ -513,54 +517,7 @@
|
||||
</group>
|
||||
<notebook>
|
||||
<page string="组装信息">
|
||||
<group col="1" attrs="{'invisible': [('assemble_status', '=', '0')]}">
|
||||
<group col="1">
|
||||
<group>
|
||||
<group>
|
||||
<field name="barcode_id" invisible="True"/>
|
||||
<field name="rfid" string="功能刀具rfid"/>
|
||||
<field name="code"/>
|
||||
<field name="after_assembly_functional_tool_name"
|
||||
string="功能刀具名称"/>
|
||||
<field name="after_assembly_functional_tool_type_id"
|
||||
string="功能刀具类型"/>
|
||||
<field name="tool_groups_id"/>
|
||||
<field name="after_assembly_whether_standard_knife"
|
||||
string="是否标准刀"/>
|
||||
<field name="after_assembly_coarse_middle_thin" string="粗/中/精"
|
||||
attrs="{'readonly': [('assemble_status', 'in', ['1','2'])]}"/>
|
||||
<field name="after_assembly_new_former" string="新/旧"
|
||||
attrs="{'readonly': [('assemble_status', 'in', ['1','2'])]}"/>
|
||||
<field name="cut_time"
|
||||
attrs="{'invisible': [('after_assembly_new_former', '=', '0')]}"/>
|
||||
<field name="cut_length"
|
||||
attrs="{'invisible': [('after_assembly_new_former', '=', '0')]}"/>
|
||||
<field name="cut_number"
|
||||
attrs="{'invisible': [('after_assembly_new_former', '=', '0')]}"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="after_assembly_functional_tool_diameter"
|
||||
string="刀具直径(mm)"/>
|
||||
<field name="after_assembly_knife_tip_r_angle" string="刀尖R角(mm)"/>
|
||||
<field name="after_assembly_tool_loading_length" string="总长度(mm)"/>
|
||||
<field name="after_assembly_handle_length" string="刀柄长度(mm)"
|
||||
attrs="{'readonly': [('assemble_status', 'in', ['1','2'])]}"/>
|
||||
<field name="after_assembly_functional_tool_length"
|
||||
string="伸出长(mm)"/>
|
||||
<field name="after_assembly_max_lifetime_value"
|
||||
string="最大寿命值(min)"/>
|
||||
<field name="after_assembly_alarm_value" string="报警值(min)"
|
||||
attrs="{'readonly': [('assemble_status', 'in', ['1','2'])]}"/>
|
||||
<field name="after_assembly_used_value" string="已使用值(min)"
|
||||
invisible="1"/>
|
||||
<field name="after_assembly_effective_length" string="有效长(mm)"
|
||||
invisible="1"/>
|
||||
<field name="L_D_number" invisible="1"/>
|
||||
<field name="hiding_length" invisible="1"/>
|
||||
</group>
|
||||
</group>
|
||||
</group>
|
||||
</group>
|
||||
<field name="_barcode_scanned" widget="barcode_handler"/>
|
||||
<group attrs="{'invisible': [('assemble_status', '=', '0')]}">
|
||||
<group col="1">
|
||||
<div>
|
||||
@@ -641,17 +598,15 @@
|
||||
<separator string="刀杆:" style="font-size: 13px;"/>
|
||||
</div>
|
||||
<group>
|
||||
<group>
|
||||
<field name="bar_freight_barcode_id" string="货位"
|
||||
attrs="{'readonly': [('assemble_status', 'in', ['1','2'])]}"/>
|
||||
<field name="bar_freight_lot_id" string="批次"
|
||||
attrs="{'readonly': [('assemble_status', 'in', ['1','2'])]}"/>
|
||||
<field name="bar_lot_id" invisible="1"/>
|
||||
<field name="bar_product_id" string="名称"/>
|
||||
<field name="cutting_tool_cutterbar_model_id" string="型号"/>
|
||||
<field name="bar_specification_id" string="规格"/>
|
||||
<field name="sf_tool_brand_id_3" string="品牌"/>
|
||||
</group>
|
||||
<field name="bar_freight_barcode_id" string="货位"
|
||||
attrs="{'readonly': [('assemble_status', 'in', ['1','2'])]}"/>
|
||||
<field name="bar_freight_lot_id" string="批次"
|
||||
attrs="{'readonly': [('assemble_status', 'in', ['1','2'])]}"/>
|
||||
<field name="bar_lot_id" invisible="1"/>
|
||||
<field name="bar_product_id" string="名称"/>
|
||||
<field name="cutting_tool_cutterbar_model_id" string="型号"/>
|
||||
<field name="bar_specification_id" string="规格"/>
|
||||
<field name="sf_tool_brand_id_3" string="品牌"/>
|
||||
</group>
|
||||
</group>
|
||||
<group col="1"
|
||||
@@ -675,6 +630,59 @@
|
||||
</group>
|
||||
</group>
|
||||
</group>
|
||||
<group col="1" attrs="{'invisible': [('assemble_status', '=', '0')]}">
|
||||
<group col="1">
|
||||
<group string="组装参数信息">
|
||||
<group>
|
||||
<field name="barcode_id" invisible="True"/>
|
||||
<field name="rfid" string="功能刀具rfid"/>
|
||||
<field name="code"/>
|
||||
<field name="after_assembly_functional_tool_name"
|
||||
string="功能刀具名称"/>
|
||||
<field name="after_assembly_functional_tool_type_id"
|
||||
string="功能刀具类型"/>
|
||||
<field name="tool_groups_id"/>
|
||||
<field name="after_assembly_whether_standard_knife"
|
||||
string="是否标准刀" invisible="1"/>
|
||||
<field name="after_assembly_coarse_middle_thin" string="粗/中/精"
|
||||
attrs="{'readonly': [('assemble_status', 'in', ['1','2'])]}"/>
|
||||
<field name="after_assembly_new_former" string="新/旧"
|
||||
attrs="{'readonly': [('assemble_status', 'in', ['1','2'])]}"/>
|
||||
<field name="cut_time"
|
||||
attrs="{'invisible': [('after_assembly_new_former', '=', '0')]}"/>
|
||||
<field name="cut_length"
|
||||
attrs="{'invisible': [('after_assembly_new_former', '=', '0')]}"/>
|
||||
<field name="cut_number"
|
||||
attrs="{'invisible': [('after_assembly_new_former', '=', '0')]}"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="after_assembly_functional_tool_diameter" readonly="0"
|
||||
string="刀具直径(mm)"
|
||||
attrs="{'readonly': [('assemble_status', 'in', ['1','2'])]}"/>
|
||||
<field name="after_assembly_knife_tip_r_angle" readonly="0"
|
||||
string="刀尖R角(mm)"
|
||||
attrs="{'readonly': [('assemble_status', 'in', ['1','2'])]}"/>
|
||||
<field name="after_assembly_tool_loading_length" readonly="0"
|
||||
string="总长度(mm)"
|
||||
attrs="{'readonly': [('assemble_status', 'in', ['1','2'])]}"/>
|
||||
<field name="after_assembly_handle_length" string="刀柄长度(mm)"
|
||||
attrs="{'readonly': [('assemble_status', 'in', ['1','2'])]}"/>
|
||||
<field name="after_assembly_functional_tool_length"
|
||||
string="伸出长(mm)"/>
|
||||
<field name="after_assembly_max_lifetime_value"
|
||||
string="最大寿命值(min)"/>
|
||||
<field name="after_assembly_alarm_value" string="报警值(min)"
|
||||
invisible="1"/>
|
||||
<field name="after_assembly_used_value" string="已使用值(min)"
|
||||
invisible="1"/>
|
||||
<field name="after_assembly_effective_length" string="有效长(mm)"
|
||||
invisible="1"/>
|
||||
<field name="L_D_number" invisible="1"/>
|
||||
<field name="hiding_length" invisible="1"/>
|
||||
</group>
|
||||
</group>
|
||||
</group>
|
||||
</group>
|
||||
</page>
|
||||
<page string="装刀信息">
|
||||
<group>
|
||||
@@ -734,10 +742,8 @@
|
||||
<field name="code" string="功能刀具编码"/>
|
||||
<field name="barcode_id"/>
|
||||
|
||||
<filter name="no_assemble_status" string="未组装"
|
||||
domain="[('assemble_status', 'in', ['0', '01'])]"/>
|
||||
<filter name="no_assemble_status" string="未组装" domain="[('assemble_status', 'in', ['0','01'])]"/>
|
||||
<filter name="yes_assemble_status" string="已组装" domain="[('assemble_status', '=', '1')]"/>
|
||||
<filter name="cancel_assemble_status" string="已取消" domain="[('assemble_status', '=', '3')]"/>
|
||||
<separator/>
|
||||
<filter string="已归档" name="inactive" domain="[('active', '=', False)]"/>
|
||||
<searchpanel>
|
||||
|
||||
Reference in New Issue
Block a user