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

1、功能刀具拆解单添加功能刀具唯一校验；2、功能刀具模型tree视图的状态字段根据不同状态添加不同颜色；当功能刀具状态为报警时，自动创建拆解单和预警记录，并添加拆解单链接按钮；添加tree视图按状态排序，将报警状态刀具记录显示在最前面；3、优化功能刀具预警模型字段及关联关系，添加预警记录跳转到对应由该功能刀具生成的拆解单链接；

Browse Source
This commit is contained in:
yuxianghui
2024-08-12 17:25:56 +08:00
parent e6ca4c27ac
commit 894d3b9ea3
4 changed files with 103 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
sf_tool_management/views/functional_tool_views.xml
View File

@@ -25,7 +25,10 @@
<field name="max_lifetime_value"/>
<field name="alarm_value"/>
<field name="used_value"/>
<field name="functional_tool_status"/>
<field name="functional_tool_status" widget='badge'
decoration-success="functional_tool_status == '正常'"
decoration-muted="functional_tool_status == '已拆除'"
decoration-danger="functional_tool_status == '报警'"/>
<field name="current_location" string="当前位置"/>
<field name="current_location_id" invisible="1"/>
@@ -48,6 +51,16 @@
<div class="oe_button_box" name="button_box">
<!-- <button name="button_safe_inventory_id" string="更新功能刀具关联的安全库存记录"-->
<!-- type="object" class="btn-primary"/>-->
<button class="oe_stat_button" groups="sf_base.group_sf_mrp_user"
name="open_functional_tool_dismantle_form"
icon="fa-list-ul"
type="object">
<div class="o_field_widget o_stat_info">
<span>
拆解单
</span>
</div>
</button>
<button class="oe_stat_button" groups="sf_base.group_sf_mrp_user"
name="open_functional_tool_warning"
icon="fa-list-ul"
@@ -235,16 +248,18 @@
<field name="name">sf.functional.tool.warning.tree</field>
<field name="model">sf.functional.tool.warning</field>
<field name="arch" type="xml">
<tree string="功能刀具预警" create="0" edit="0" delete="0" editable="bottom">
<tree string="功能刀具预警" create="0" edit="0" delete="0" editable="bottom" default_order="id desc"
action="action_open_dismantle" type="object">
<field name="production_line_id" invisible="1"/>
<field name="maintenance_equipment_id" invisible="1"/>
<field name="machine_tool_code" invisible="1"/>
<field name="cutter_spacing_code_id" invisible="1"/>
<field name="on_board_time" invisible="1"/>
<field name="functional_tool_status" invisible="1"/>
<field name="functional_tool_name_id" invisible="1"/>
<field name="rfid"/>
<field name="functional_tool_name_id"/>
<field name="functional_tool_id"/>
<field name="barcode_id" optional="hide"/>
<field name="diameter" optional="hide"/>
<field name="knife_tip_r_angle" optional="hide"/>

2
sf_tool_management/views/tool_base_views.xml
View File

@@ -911,7 +911,7 @@
</group>
</group>
</page>
<page string="报废"
<page string="报废单"
attrs="{'invisible':[('dismantle_cause', 'not in', ['寿命到期报废','崩刀报废'])]}">
<field name="scrap_ids">
<tree>