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

1、功能刀具组装单添加对应调拨单跳转按钮；功能刀具拆解单添加调拨单跳转按钮和功能刀具移动跳转按钮；2、功能刀具拆解模型，form视图添加报废page页存放刀具物料报废单，优化拆解流程添加功能刀具拆解移动记录；3、功能刀具出入库列表视图添加拆解单跳转链接；4、功能刀具安全库存模型添加名称唯一验证，优化字段计算方法；5、优化功能刀具同步到cloud的同步接口，解决编码问题；

Browse Source
This commit is contained in:
yuxianghui
2024-07-03 17:17:48 +08:00
parent cbc8a41984
commit 4a86871039
5 changed files with 158 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sf_tool_management/views/functional_tool_views.xml
View File

@@ -29,7 +29,6 @@
<field name="current_location" string="当前位置"/>
<field name="current_location_id" invisible="1"/>
<field name="current_location" optional="hide"/>
<field name="sf_cutting_tool_type_id" invisible="True"/>
</tree>
</field>
@@ -61,13 +60,9 @@
</button>
<button class="oe_stat_button" groups="sf_base.group_sf_mrp_user"
name="open_stock_move_line"
icon="fa-list-ul"
type="object">
<div class="o_field_widget o_stat_info">
<span>
出库入库记录
</span>
</div>
<i class="fa fa-fw o_button_icon fa-exchange"/>
<span>出库入库记录</span>
</button>
<button class="oe_stat_button" groups="sf_base.group_sf_mrp_user"
name="open_safety_stock"
@@ -482,18 +477,19 @@
<field name="reference" string="单据号"/>
<field name="lot_id" invisible="1"/>
<field name="rfid"/>
<field name="functional_tool_name_id" optional="hide"/>
<field name="functional_tool_name" string="功能刀具名称"/>
<field name="diameter"/>
<field name="knife_tip_r_angle"/>
<field name="install_tool_time"/>
<field name="location_id"/>
<field name="current_location_id"/>
<field name="location_dest_id"/>
<field name="destination_location_id"/>
<field name="date"/>
<field name="qty_done" string="数量"/>
<field name="functional_tool_type_id" invisible="True"/>
<field name="functional_tool_type_id" invisible="1"/>
<field name="functional_tool_name_id" invisible="1"/>
<field name="functional_tool_dismantle_id" invisible="1"/>
<field name="install_tool_time" invisible="1"/>
<!-- <button name="enroll_functional_tool_move" string="安全库存注册" type="object" class="btn-primary"/>-->
</tree>
</field>

52
sf_tool_management/views/tool_base_views.xml
View File

@@ -407,6 +407,7 @@
<field name="plan_execute_status"/>
<filter string="已归档" name="inactive" domain="[('active', '=', False)]"/>
<searchpanel>
<field name="plan_execute_status" string="状态" enable_counters="1" icon="fa-filter"/>
<field name="production_line_id" string="生产线" enable_counters="1" icon="fa-filter"/>
<field name="functional_tool_type_id" string="功能刀具类型" enable_counters="1"
icon="fa-filter"/>
@@ -476,6 +477,17 @@
<field name="assemble_status" widget="statusbar" statusbar_visible="0,1"/>
</header>
<sheet>
<div class="oe_button_box" name="button_box">
<button class="oe_stat_button" name="open_tool_stock_picking" icon="fa-truck" type="object"
attrs="{'invisible': [('assemble_status', '!=', '1')]}">
<div name="delivery_count" class="o_field_widget o_readonly_modifier o_field_statinfo">
<span class="o_stat_info o_stat_value">
<field name="picking_num"/>
</span>
<span class="o_stat_text">调拨</span>
</div>
</button>
</div>
<div class="oe_title">
<h1>
<field name="assembly_order_code"/>
@@ -763,10 +775,25 @@
<form>
<header>
<button string="确认拆解" name="confirmation_disassembly" type="object" class="btn-primary"
confirm="是否确认拆解" attrs="{'invisible': [('state', '=', '已拆解')]}"/>
confirm="是否确认拆解" attrs="{'invisible': [('state', '!=', '已拆解')]}"/>
<field name="state" widget="statusbar" statusbar_visible="待拆解,已拆解"/>
</header>
<sheet>
<div class="oe_button_box" name="button_box">
<button class="oe_stat_button" name="open_tool_stock_picking" icon="fa-truck" type="object"
attrs="{'invisible':[('state', '!=', '已拆解')]}">
<div name="delivery_count" class="o_field_widget o_readonly_modifier o_field_statinfo">
<span class="o_stat_info o_stat_value">
<field name="picking_num"/>
</span>
<span class="o_stat_text">调拨</span>
</div>
</button>
<button class="oe_stat_button" name="open_function_tool_stock_move_line" icon="fa-exchange"
type="object">
<span>功能刀具移动</span>
</button>
</div>
<div class="oe_title">
<h1>
<field name="code"/>
@@ -777,12 +804,13 @@
<group>
<field name="functional_tool_id" placeholder="请选择将要拆解的功能刀具"
options="{'no_create': True}" attrs="{'readonly': [('state', '=', '已拆解')]}"/>
<field name="rfid" attrs="{'invisible': [('state', '=', '已拆解')]}"/>
<field name="rfid_dismantle" attrs="{'invisible': [('state', '!=', '已拆解')]}"/>
<field name="rfid" attrs="{'invisible': [('rfid', '=', '')]}"/>
<field name="rfid_dismantle" attrs="{'invisible': [('rfid_dismantle', '=', False)]}"/>
<field name="tool_type_id"/>
<field name="tool_groups_id"/>
<field name="diameter"/>
<field name="knife_tip_r_angle"/>
<field name="picking_id" invisible="1"/>
</group>
<group>
<field name="image"/>
@@ -883,8 +911,22 @@
</group>
</group>
</page>
<page string="报废" attrs="{'invisible':[('dismantle_cause', 'not in', ['寿命到期报废','崩刀报废'])]}">
<field name="scrap_ids"/>
<page string="报废"
attrs="{'invisible':[('dismantle_cause', 'not in', ['寿命到期报废','崩刀报废'])]}">
<field name="scrap_ids">
<tree>
<field name="name"/>
<field name="product_id"/>
<field name="lot_id"/>
<field name="location_id"/>
<field name="scrap_location_id"/>
<field name="scrap_qty"/>
<field name="product_uom_id"/>
<field name="date_done"/>
<field name="state" widget="badge" decoration-success="state == 'done'"
decoration-muted="state == 'draft'"/>
</tree>
</field>
</page>
<page string="其他">
<group>