1、对组装单物料批次号获取逻辑进行优化,更改form视图批次字段显示条件;2、开发 寿命到期功能刀具完成拆解后关联生成并跳转到组装单的需求 需求
This commit is contained in:
@@ -544,8 +544,9 @@
|
||||
<field name="chuck_freight_barcode_id" string="货位"
|
||||
attrs="{'readonly': [('assemble_status', 'in', ['1','2'])]}"/>
|
||||
<field name="chuck_freight_lot_id" string="批次"
|
||||
attrs="{'readonly': [('assemble_status', 'in', ['1','2'])]}"/>
|
||||
<field name="chuck_lot_id" invisible="1"/>
|
||||
attrs="{'invisible': [('assemble_status', 'in', ['1','2'])]}"/>
|
||||
<field name="chuck_lot_id" string="批次"
|
||||
attrs="{'invisible': [('assemble_status', 'in', ['0','01'])]}"/>
|
||||
<field name="chuck_product_id" string="名称"/>
|
||||
<field name="cutting_tool_cutterhead_model_id" string="型号"/>
|
||||
<field name="chuck_specification_id" string="规格"/>
|
||||
@@ -557,7 +558,7 @@
|
||||
<group attrs="{'invisible': [('assemble_status', '=', '0')]}">
|
||||
<group col="1">
|
||||
<group col="1"
|
||||
attrs="{'invisible': [('integral_freight_lot_id', '=', False),'|','|','|', ('blade_freight_lot_id', '!=', False),('bar_freight_lot_id', '!=', False),('pad_freight_lot_id', '!=', False),('assemble_status', 'not in', ['0','01'])]}">
|
||||
attrs="{'invisible': [('integral_lot_id', '=', False),'|','|','|', ('blade_lot_id', '!=', False),('bar_lot_id', '!=', False),('pad_lot_id', '!=', False),('assemble_status', 'not in', ['0','01'])]}">
|
||||
<div>
|
||||
<separator string="整体式刀具:" style="font-size: 13px;"/>
|
||||
</div>
|
||||
@@ -565,8 +566,9 @@
|
||||
<field name="integral_freight_barcode_id" string="货位"
|
||||
attrs="{'readonly': [('assemble_status', 'in', ['1','2'])]}"/>
|
||||
<field name="integral_freight_lot_id" string="批次"
|
||||
attrs="{'readonly': [('assemble_status', 'in', ['1','2'])]}"/>
|
||||
<field name="integral_lot_id" invisible="1"/>
|
||||
attrs="{'invisible': [('assemble_status', 'in', ['1','2'])]}"/>
|
||||
<field name="integral_lot_id" string="批次"
|
||||
attrs="{'invisible': [('assemble_status', 'in', ['0','01'])]}"/>
|
||||
<field name="integral_product_id" string="名称"/>
|
||||
<field name="cutting_tool_integral_model_id" string="型号"/>
|
||||
<field name="integral_specification_id" string="规格"/>
|
||||
@@ -574,7 +576,7 @@
|
||||
</group>
|
||||
</group>
|
||||
<group col="1"
|
||||
attrs="{'invisible': [('blade_freight_lot_id', '=', False),'|', ('integral_freight_lot_id', '!=', False),('assemble_status', 'not in', ['0','01'])]}">
|
||||
attrs="{'invisible': [('blade_lot_id', '=', False),'|', ('integral_lot_id', '!=', False),('assemble_status', 'not in', ['0','01'])]}">
|
||||
<div>
|
||||
<separator string="刀片:" style="font-size: 13px;"/>
|
||||
</div>
|
||||
@@ -582,8 +584,9 @@
|
||||
<field name="blade_freight_barcode_id" string="货位"
|
||||
attrs="{'readonly': [('assemble_status', 'in', ['1','2'])]}"/>
|
||||
<field name="blade_freight_lot_id" string="批次"
|
||||
attrs="{'readonly': [('assemble_status', 'in', ['1','2'])]}"/>
|
||||
<field name="blade_lot_id" invisible="1"/>
|
||||
attrs="{'invisible': [('assemble_status', 'in', ['1','2'])]}"/>
|
||||
<field name="blade_lot_id" string="批次"
|
||||
attrs="{'invisible': [('assemble_status', 'in', ['0','01'])]}"/>
|
||||
<field name="blade_product_id" string="名称"/>
|
||||
<field name="cutting_tool_blade_model_id" string="型号"/>
|
||||
<field name="blade_specification_id" string="规格"/>
|
||||
@@ -593,7 +596,7 @@
|
||||
</group>
|
||||
<group col="1">
|
||||
<group col="1"
|
||||
attrs="{'invisible': [('bar_freight_lot_id', '=', False),'|','|',('integral_freight_lot_id', '!=', False),('pad_freight_lot_id', '!=', False),('assemble_status', 'not in', ['0','01'])]}">
|
||||
attrs="{'invisible': [('bar_lot_id', '=', False),'|','|',('integral_lot_id', '!=', False),('pad_lot_id', '!=', False),('assemble_status', 'not in', ['0','01'])]}">
|
||||
<div>
|
||||
<separator string="刀杆:" style="font-size: 13px;"/>
|
||||
</div>
|
||||
@@ -601,8 +604,9 @@
|
||||
<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"/>
|
||||
attrs="{'invisible': [('assemble_status', 'in', ['1','2'])]}"/>
|
||||
<field name="bar_lot_id" string="批次"
|
||||
attrs="{'invisible': [('assemble_status', 'in', ['0','01'])]}"/>
|
||||
<field name="bar_product_id" string="名称"/>
|
||||
<field name="cutting_tool_cutterbar_model_id" string="型号"/>
|
||||
<field name="bar_specification_id" string="规格"/>
|
||||
@@ -610,7 +614,7 @@
|
||||
</group>
|
||||
</group>
|
||||
<group col="1"
|
||||
attrs="{'invisible': [('pad_freight_lot_id', '=', False),'|','|',('integral_freight_lot_id', '!=', False),('bar_freight_lot_id', '!=', False),('assemble_status', 'not in', ['0','01'])]}">
|
||||
attrs="{'invisible': [('pad_lot_id', '=', False),'|','|',('integral_lot_id', '!=', False),('bar_lot_id', '!=', False),('assemble_status', 'not in', ['0','01'])]}">
|
||||
<div>
|
||||
<separator string="刀盘:" style="font-size: 13px;"/>
|
||||
</div>
|
||||
@@ -619,8 +623,9 @@
|
||||
<field name="pad_freight_barcode_id" string="货位"
|
||||
attrs="{'readonly': [('assemble_status', 'in', ['1','2'])]}"/>
|
||||
<field name="pad_freight_lot_id" string="批次"
|
||||
attrs="{'readonly': [('assemble_status', 'in', ['1','2'])]}"/>
|
||||
<field name="pad_lot_id" invisible="1"/>
|
||||
attrs="{'invisible': [('assemble_status', 'in', ['1','2'])]}"/>
|
||||
<field name="pad_lot_id" string="批次"
|
||||
attrs="{'invisible': [('assemble_status', 'in', ['0','01'])]}"/>
|
||||
<field name="pad_product_id" string="名称"/>
|
||||
<field name="cutting_tool_cutterpad_model_id" string="型号"/>
|
||||
<field name="pad_specification_id" string="规格"/>
|
||||
|
||||
Reference in New Issue
Block a user