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

Merge branch refs/heads/develop into refs/heads/hotfix/功能刀具出入库处理

Browse Source
This commit is contained in:
禹翔辉
2024-06-17 14:36:00 +08:00
parent 1e90b9a18a 01f55350e2
commit c1f33c5e14
44 changed files with 1406 additions and 723 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
sf_tool_management/views/functional_tool_views.xml
View File

@@ -6,7 +6,7 @@
<field name="name">sf.functional.cutting.tool.entity.list.tree</field>
<field name="model">sf.functional.cutting.tool.entity</field>
<field name="arch" type="xml">
<tree string="功能刀具列表" create="0" edit="0" delete="0">
<tree string="功能刀具" create="0" edit="0" delete="0">
<field name="barcode_id" invisible="1"/>
<field name="rfid"/>
<field name="tool_name_id"/>
@@ -19,13 +19,14 @@
<field name="tool_loading_length" optional="hide"/>
<field name="functional_tool_length" optional="hide"/>
<field name="effective_length" optional="hide"/>
<field name="tool_room_num"/>
<field name="line_edge_knife_library_num"/>
<field name="machine_knife_library_num"/>
<field name="tool_room_num" optional="hide"/>
<field name="line_edge_knife_library_num" optional="hide"/>
<field name="machine_knife_library_num" optional="hide"/>
<field name="max_lifetime_value"/>
<field name="alarm_value"/>
<field name="used_value"/>
<field name="functional_tool_status"/>
<field name="current_location" string="当前位置"/>
<field name="current_location_id" invisible="1"/>
<field name="current_location" optional="hide"/>
@@ -115,7 +116,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"/>
<field name="safe_inventory_id" invisible="1"/>
</group>
<group>
<field name="image" nolabel="1" widget="image"/>
@@ -196,16 +197,30 @@
<field name="tool_name_id"/>
<field name="functional_tool_diameter"/>
<field name="knife_tip_r_angle"/>
<filter string="刀具房" name="tool_room" domain="[('current_location', '=', '刀具房')]"/>
<filter string="线边刀库" name="storage_area" domain="[('current_location', '=', '线边刀库')]"/>
<filter string="机内刀库" name="machine_knife_library"
domain="[('current_location', '=', '机内刀库')]"/>
<separator/>
<filter string="正常" name="normal" domain="[('functional_tool_status', '=', '正常')]"/>
<filter string="报警" name="alarm" domain="[('functional_tool_status', '=', '报警')]"/>
<separator/>
<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)]"/>
<searchpanel>
<field name="current_location" icon="fa-building" enable_counters="1"/>
<field name="functional_tool_status" icon="fa-building" enable_counters="1"/>
<field name="sf_cutting_tool_type_id" icon="fa-building" enable_counters="1"/>
</searchpanel>
<group expand="0">
<filter string="功能刀具名称" name="tool_name" domain="[]"
context="{'group_by': 'tool_name_id'}"/>
<filter string="刀具组" name="tool_groups" domain="[]"
context="{'group_by': 'tool_groups_id'}"/>
<filter string="当前位置" name="current_location" domain="[]"
context="{'group_by': 'current_location'}"/>
</group>
</search>
</field>
</record>
@@ -301,11 +316,10 @@
<tree>
<field name="name" invisible="1"/>
<field name="functional_name_id"/>
<field name="sf_cutting_tool_type_id" invisible="True"/>
<field name="tool_groups_id"/>
<field name="diameter"/>
<field name="knife_tip_r_angle"/>
<field name="coarse_middle_thin"/>
<field name="coarse_middle_thin" optional="hide"/>
<field name="tool_stock_num"/>
<field name="side_shelf_num"/>
<field name="on_tool_stock_num"/>
@@ -314,6 +328,8 @@
<field name="max_stock_num"/>
<field name="batch_replenishment_num"/>
<field name="unit"/>
<field name="sf_cutting_tool_type_id" invisible="True"/>
</tree>
</field>
</record>
@@ -415,6 +431,10 @@
</page>
</notebook>
</sheet>
<div class="oe_chatter">
<field name="message_follower_ids"/>
<field name="message_ids"/>
</div>
</form>
</field>
</record>
@@ -425,21 +445,20 @@
<field name="arch" type="xml">
<search>
<field name="name"/>
<field name="sf_cutting_tool_type_id" invisible="True"/>
<field name="tool_groups_id"/>
<field name="sf_cutting_tool_type_id"/>
<field name="diameter"/>
<field name="knife_tip_r_angle"/>
<field name="tool_stock_num"/>
<field name="side_shelf_num"/>
<field name="on_tool_stock_num"/>
<field name="tool_stock_total"/>
<field name="min_stock_num"/>
<field name="max_stock_num"/>
<field name="batch_replenishment_num"/>
<field name="unit"/>
<filter string="需补货" name="batch_replenishment" domain="[('batch_replenishment_num', '>', 0)]"/>
<separator/>
<filter string="已归档" name="inactive" domain="[('active', '=', False)]"/>
<searchpanel>
<field name="sf_cutting_tool_type_id" enable_counters="1" icon="fa-building"/>
</searchpanel>
<group expand="0">
<filter string="刀具组" name="tool_groups" domain="[]"
context="{'group_by': 'tool_groups_id'}"/>
</group>
</search>
</field>
</record>