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

1、注释action_apply_inventory()方法；2、功能刀具安全库存添加one2many类型的功能刀具废弃many2many类型的关联字段并优化代码，并在功能刀具模型添加功能按钮用来绑定功能刀具和对应的功能刀具安全库存；3、优化根据库存创建功能刀具组装单的方法断定条件；4、优化刀具注册接口的报错处理；5、优化组装流程

Browse Source
This commit is contained in:
yuxianghui
2024-05-18 11:54:23 +08:00
parent 305e91e7f1
commit 9e2091597b
5 changed files with 275 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sf_tool_management/views/functional_tool_views.xml
View File

@@ -46,6 +46,8 @@
</header>
<sheet>
<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_warning"
icon="fa-list-ul"
@@ -89,9 +91,9 @@
attrs="{'invisible': [('functional_tool_status', '=', '已拆除')]}"/>
<field name="rfid_dismantle" readonly="1"
attrs="{'invisible': [('functional_tool_status', '!=', '已拆除')]}"/>
<field name="tool_name_id" invisible="0"
<field name="tool_name_id" invisible="0" readonly="1"
placeholder="请输入20字以内的名称"/>
<field name="sf_cutting_tool_type_id"/>
<field name="sf_cutting_tool_type_id" readonly="1"/>
<field name="tool_groups_id"/>
<field name="cutting_tool_integral_model_id"
options="{'no_create': True, 'no_quick_create': True}"
@@ -113,6 +115,7 @@
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="safe_inventory_id" readonly="0"/>
</group>
<group>
<field name="image" nolabel="1" widget="image"/>
@@ -188,7 +191,8 @@
<field name="tool_name_id"/>
<field name="functional_tool_diameter"/>
<field name="knife_tip_r_angle"/>
<filter string="未拆除" name="no_state_removed" domain="[('functional_tool_status', '!=', '已拆除')]"/>
<filter string="未拆除" name="no_state_removed"
domain="[('functional_tool_status', '!=', '已拆除')]"/>
<filter string="已拆除" name="state_removed" domain="[('functional_tool_status', '=', '已拆除')]"/>
<separator/>
<filter string="已归档" name="inactive" domain="[('active', '=', False)]"/>
@@ -385,7 +389,8 @@
</group>
<notebook>
<page string="刀具信息">
<field name="sf_functional_cutting_tool_entity_ids" widget="many2many">
<field name="sf_functional_cutting_tool_entity_ids" invisible="1" widget="many2many"/>
<field name="sf_functional_tool_entity_ids" widget="one2many">
<tree edit="0" create="0" delete="0">
<field name="rfid"/>
<field name="tool_name_id"/>