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

Merge remote-tracking branch 'origin/feature/销售和排程添加消息推送' into feature/销售和排程添加消息推送

Browse Source
This commit is contained in:
liaodanlong
2024-09-26 14:55:32 +08:00
parent 3cc2bb94fe de42382f58
commit ed4924651a
185 changed files with 410 additions and 5777 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sf_tool_management/views/tool_base_views.xml
View File

@@ -283,21 +283,22 @@
<field name="arch" type="xml">
<tree create="0">
<field name="name" string="工单编码"/>
<field name="cam_procedure_code"/>
<field name="filename"/>
<field name="programming_no"/>
<field name="cam_procedure_code" optional="hide"/>
<field name="filename" optional="hide"/>
<field name="functional_tool_name" string="刀具名称"/>
<field name="cam_cutter_spacing_code"/>
<field name="diameter" optional="hide"/>
<field name="tool_included_angle" optional="hide"/>
<field name="process_type"/>
<field name="process_type" optional="hide"/>
<field name="margin_x_y"/>
<field name="margin_z"/>
<field name="finish_depth"/>
<field name="extension_length" string="刀具伸出长度(mm)"/>
<field name="shank_model"/>
<field name="estimated_processing_time"/>
<field name="need_knife_time"/>
<field name="applicant_time"/>
<field name="need_knife_time" optional="hide"/>
<field name="applicant_time" optional="hide"/>
<field name="plan_execute_status"/>
<field name="production_line_id" invisible="1"/>
@@ -332,6 +333,7 @@
</div>
<group>
<group>
<field name="programming_no"/>
<field name="cam_procedure_code"/>
<field name="filename"/>
<field name="production_line_id"/>
@@ -388,6 +390,7 @@
<field name="model">sf.cam.work.order.program.knife.plan</field>
<field name="arch" type="xml">
<search>
<field name="programming_no"/>
<field name="name" string="工单编码"/>
<field name="cam_procedure_code"/>
<field name="filename"/>

2
sf_tool_management/views/tool_inventory.xml
View File

@@ -16,7 +16,7 @@
<record id="view_tool_inventory_inherit_search" model="ir.ui.view">
<field name="name">sf.tool.inventory.inherit.search</field>
<field name="model">sf.tool.inventory</field>
<field name="inherit_id" ref="sf_base.view_cutting_tool_material_search"/>
<field name="inherit_id" ref="sf_base.view_cutting_tool_inventory_search"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='extension']" position="after">
<searchpanel>